Merge remote-tracking branch 'origin/collection-attribute' into runtime-extensions

trainbenchmark-tool-jastadd-namelookup-base/src/main/jastadd/TreeNavigation.jrag

+import java.util.HashSet;
+
 aspect TreeNavigation {
 
   // collections of things
@@ -215,29 +217,25 @@ aspect TreeNavigation {
     return getTarget().getSwitch();
   }
 
-  syn Collection<Sensor> TrackElement.monitoredBy() {
-    return getRoot().monitoredByMap().get(this.id());
-  }
+  coll ArrayList<Sensor> TrackElement.monitoredBy() [new ArrayList()] with add;
 
-  syn Map<Integer,Set<Sensor>> RailwayContainer.monitoredByMap() {
-    Map<Integer,Set<Sensor>> sensorMap = new java.util.HashMap<>();
+  Sensor contributes this
+    to TrackElement.monitoredBy()
+    for each monitoredElements();
 
-    // fill the keys
-    for (Region region: getRegionList()) {
-      for (TrackElement trackElement: region.getTrackElementList()) {
-        sensorMap.put(trackElement.id(), new java.util.HashSet<>());
-      }
-    }
+  RailwayContainer contributes {
+    // Explicitly traverses regions, skips routes.
+    getRegionList().collectContributions();
+  } to TrackElement.monitoredBy();
 
-    // update the values
-    for (Sensor sensor : sensors()) {
-      for (TrackElementRef trackElementRef : sensor.getMonitoredElementList()) {
-        sensorMap.get(trackElementRef.getValue()).add(sensor);
-      }
-    }
+  Region contributes {
+    // Explicitly traverses sensors, skips elements.
+    getSensorList().collectContributions();
+  } to TrackElement.monitoredBy();
 
-    return sensorMap;
-  }
+  Sensor contributes {
+    // Stop at sensor, only contains refs.
+  } to TrackElement.monitoredBy();
 
   syn Collection<Route> Sensor.requiringRoutes() {
     return getRoot().requiringRoutesMap().get(this.id());