Merge pull request #3 from wsp-sag/bart-feat-mode-choice

Add person type getter for mode choice
wsp-sag · May 27, 2022 · d03566a · d03566a
2 parents bcb6757 + ede30c6
commit d03566a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 0 deletions.
diff --git a/core/projects/mtc/release/mtc.jar b/core/projects/mtc/release/mtc.jar
diff --git a/core/projects/mtc/src/java/com/pb/mtc/ctramp/MtcModeChoiceDMU.java b/core/projects/mtc/src/java/com/pb/mtc/ctramp/MtcModeChoiceDMU.java
@@ -185,7 +185,14 @@ private int[] getZoneTableIntColumn( TazDataIf tazDataManager, String fieldName
 
         return ( tazDataManager.getZoneTableIntColumn( fieldName ) );
     }
+
+    public String getPersonType() {
+        return person.getPersonType();
+    }
 
+    public int getPersonTypeNumber() {
+        return person.getPersonTypeNumber();
+    }
 
 
     private void setupMethodIndexMap() {
@@ -231,6 +238,7 @@ private void setupMethodIndexMap() {
         methodIndexMap.put( "getUseOwnedAV", 36);
         methodIndexMap.put( "getOrigCounty", 37);
         methodIndexMap.put( "getHhIncomeInDollars", 38);
+        methodIndexMap.put( "getPersonTypeNumber", 39);
       }
 
 
@@ -280,6 +288,7 @@ public double getValueForIndex(int variableIndex, int arrayIndex) {
             case 36: return getUseOwnedAV();
             case 37: return getOrigCounty();
             case 38: return getHhIncomeInDollars();
+            case 39: return getPersonTypeNumber();
 
             default:
                 logger.error("method number = "+variableIndex+" not found");

diff --git a/core/projects/mtc/src/java/com/pb/mtc/ctramp/MtcTripModeChoiceDMU.java b/core/projects/mtc/src/java/com/pb/mtc/ctramp/MtcTripModeChoiceDMU.java
@@ -238,7 +238,13 @@ private int[] getZoneTableIntColumn( TazDataIf tazDataManager, String fieldName
         return ( tazDataManager.getZoneTableIntColumn( fieldName ) );
     }
 
+    public String getPersonType() {
+        return person.getPersonType();
+    }
 
+    public int getPersonTypeNumber() {
+        return person.getPersonTypeNumber();
+    }
 
 
     private void setupMethodIndexMap() {
@@ -290,6 +296,7 @@ private void setupMethodIndexMap() {
         methodIndexMap.put("getUseOwnedAV", 41);
         methodIndexMap.put("getTourModeIsRideHail", 42 );
         methodIndexMap.put("getHhIncomeInDollars", 43);
+        methodIndexMap.put("getPersonTypeNumber", 44);
 
 
     }
@@ -345,6 +352,7 @@ public double getValueForIndex(int variableIndex, int arrayIndex) {
             case 41: return getUseOwnedAV();
             case 42: return getTourModeIsRideHail();
             case 43: return getHhIncomeInDollars();
+            case 44: return getPersonTypeNumber();
 
             default:
                 logger.error("method number = "+variableIndex+" not found");

diff --git a/model-files/model/ModeChoice.xls b/model-files/model/ModeChoice.xls
diff --git a/model-files/model/TripModeChoice.xls b/model-files/model/TripModeChoice.xls
diff --git a/model-files/runtime/mtc.jar b/model-files/runtime/mtc.jar