corrected bug in reporting distances to carStream file.

wsp-sag · Dec 11, 2020 · 133b0c2 · 133b0c2
1 parent 5bc917b
commit 133b0c2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 
 jar {
     baseName = 'carTracker'
-    version =  '10Dec2020_v1.11'
+    version =  '11Dec2020_v1.12'
 }
 
 repositories {

diff --git a/src/main/java/appLayer/CarAllocatorMain.java b/src/main/java/appLayer/CarAllocatorMain.java
@@ -260,7 +260,7 @@ public static void main( String[] args ) {
 
 	    CarAllocatorMain mainObj = new CarAllocatorMain();
 
-		System.out.println ( "CarTracker, 10Dec2020, v1.11, starting." );
+		System.out.println ( "CarTracker, 11Dec2020, v1.12, starting." );
 
 		ResourceBundle rb = null;
 		if ( args.length >=0 ) {

diff --git a/src/main/java/appLayer/WriteCarAllocationOutputFilesMag.java b/src/main/java/appLayer/WriteCarAllocationOutputFilesMag.java
@@ -506,7 +506,8 @@ record = hh.getId()+","+
 	                        destHome = nextTrip.getOrigAct() == PurposeCategories.HOME.getIndex() ? 1 : 0;
 	                        origHome = trip.getDestAct() == PurposeCategories.HOME.getIndex() ? 1 : 0;
 	        				if(((SikForTrip[k]>threhsoldRoundUp & trip.getPnum() != nextTrip.getPnum())||GikForTrip[k]>threhsoldRoundUp) && destTaz != nextOrigTaz){ // no need to write intra-zonal car reposition trip
-	        					autoRecordDistance = sharedDistanceObject.getOffpeakDistanceFromTaz(origTaz)[geogManager.getMazTazValue(nextTrip.getOrigMaz())];
+	        					autoRecordDistance = sharedDistanceObject.getOffpeakDistanceFromTaz(geogManager.getMazTazValue(trip.getDestMaz()))[geogManager.getMazTazValue(nextTrip.getOrigMaz())];
+	        					//autoRecordDistance = sharedDistanceObject.getOffpeakDistanceFromTaz(origTaz)[geogManager.getMazTazValue(nextTrip.getOrigMaz())];
 	                			float departureTime = (scheduleDepart + trip.getSchedTime() + depLate - depEarly) ;
 	                			float arrivalTime = (scheduleDepart + trip.getSchedTime() + depLate - depEarly)+ Float.parseFloat(propertyMap.get("minutes.per.mile"))*autoRecordDistance;
 	                			if(SikForTrip[k]>threhsoldRoundUp){
@@ -515,8 +516,10 @@ record = hh.getId()+","+
 	                				departureTime = (nextTrip.getSchedDepart() + depLateNext - depEarlyNext) - Float.parseFloat(propertyMap.get("minutes.per.mile"))*autoRecordDistance;
 	                				arrivalTime = (nextTrip.getSchedDepart() + depLateNext - depEarlyNext);
 	                			}
-	                			tripDistanceFromHome = distanceFromHome[nextOrigTaz];
-	                			tripDistanceFromHomeToOrig = distanceFromHome[destTaz];
+	                			tripDistanceFromHome = distanceFromHome[geogManager.getMazTazValue(nextTrip.getOrigMaz())];
+	                			tripDistanceFromHomeToOrig = distanceFromHome[geogManager.getMazTazValue(trip.getDestMaz())];
+	                			//tripDistanceFromHome = distanceFromHome[nextOrigTaz];
+	                			//tripDistanceFromHomeToOrig = distanceFromHome[destTaz];
 	        					record = hh.getId()+","+
 	                					(j+1)+","+
 	                					ifAvHh+","+

diff --git a/src/main/java/appLayer/WriteCarAllocationOutputFilesOhio.java b/src/main/java/appLayer/WriteCarAllocationOutputFilesOhio.java
@@ -563,7 +563,8 @@ record = hh.getId()+","+
 	                        destHome = nextTrip.getOrigAct() == PurposeCategories.HOME.getIndex() ? 1 : 0;
 	                        origHome = trip.getDestAct() == PurposeCategories.HOME.getIndex() ? 1 : 0;
 	        				if(((SikForTrip[k]>threhsoldRoundUp & trip.getPnum() != nextTrip.getPnum())||GikForTrip[k]>threhsoldRoundUp) && destTaz != nextOrigTaz){ // no need to write intra-zonal car reposition trip
-	        					autoRecordDistance = sharedDistanceObject.getOffpeakDistanceFromTaz(origTaz)[geogManager.getMazTazValue(nextTrip.getOrigMaz())];
+	        					autoRecordDistance = sharedDistanceObject.getOffpeakDistanceFromTaz(geogManager.getMazTazValue(trip.getDestMaz()))[geogManager.getMazTazValue(nextTrip.getOrigMaz())];
+	        					//autoRecordDistance = sharedDistanceObject.getOffpeakDistanceFromTaz(origTaz)[geogManager.getMazTazValue(nextTrip.getOrigMaz())];
 	                			float departureTime = (scheduleDepart + trip.getSchedTime() + depLate - depEarly) ;
 	                			float arrivalTime = (scheduleDepart + trip.getSchedTime() + depLate - depEarly)+ Float.parseFloat(propertyMap.get("minutes.per.mile"))*autoRecordDistance;
 	                			if(SikForTrip[k]>threhsoldRoundUp){
@@ -572,8 +573,10 @@ record = hh.getId()+","+
 	                				departureTime = (nextTrip.getSchedDepart() + depLateNext - depEarlyNext) - Float.parseFloat(propertyMap.get("minutes.per.mile"))*autoRecordDistance;
 	                				arrivalTime = (nextTrip.getSchedDepart() + depLateNext - depEarlyNext);
 	                			}
-	                			tripDistanceFromHome = distanceFromHome[nextOrigTaz];
-	                			tripDistanceFromHomeToOrig = distanceFromHome[destTaz];
+	                			tripDistanceFromHome = distanceFromHome[geogManager.getMazTazValue(nextTrip.getOrigMaz())];
+	                			tripDistanceFromHomeToOrig = distanceFromHome[geogManager.getMazTazValue(trip.getDestMaz())];
+	                			//tripDistanceFromHome = distanceFromHome[nextOrigTaz];
+	                			//tripDistanceFromHomeToOrig = distanceFromHome[destTaz];
 	        					record = hh.getId()+","+
 	                					(j+1)+","+
 	                					ifAvHh+","+