Changed order of logics to discard routes

integratedmodelling · Jan 20, 2024 · 3273334 · 3273334
1 parent b4b5e9f
commit 3273334
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/...integratedmodelling/klab/components/network/services/RoutingRelationshipInstantiator.java b/...integratedmodelling/klab/components/network/services/RoutingRelationshipInstantiator.java
@@ -208,6 +208,7 @@ public List<IObjectArtifact> instantiate(IObservable semantics, IContextualizati
         Set<IObservation> connected = new HashSet<>();
 
         int nullTrajectories = 0;
+        int outOfLimitTrajectories = 0;
 
         for (IObservation source : allSources) {
 
@@ -283,25 +284,29 @@ public List<IObjectArtifact> instantiate(IObservable semantics, IContextualizati
 					trajectory = null;
 				}
 
-
-                if (
-                		(timeThreshold == null || ((Double) stats.get("time") < timeThreshold)) && 
-                		(distanceThreshold == null || ((Double) stats.get("length") < distanceThreshold))
-
-                	) 
-                {
+				if (trajectory != null && stats != null) {
+
+	                if (
+	                		(timeThreshold == null || ((Double) stats.get("time") < timeThreshold)) && 
+	                		(distanceThreshold == null || ((Double) stats.get("length") < distanceThreshold))
+
+	                	) 
+	                {
 
-                	if (trajectory != null) {
                 		connect((IDirectObservation) source, (IDirectObservation) target, trajectory, routeParameters);
                 		connected.add((IObservation) target);
                 		trajectories.put(new Pair<IDirectObservation,IDirectObservation>((IDirectObservation)source,(IDirectObservation)target),trajectory);
                 	}
-                	else {
-
-                		nullTrajectories += 1; 
-
-                	}
+	                else {
+	                	outOfLimitTrajectories += 1;
+	                }
+
                 } 	
+				else {
+
+            		nullTrajectories += 1; 
+
+            	}
 
             }
         }