A few calibration tweaks

psrc · Feb 16, 2015 · fd70519 · fd70519
1 parent f16dac3
commit fd70519
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/inputs/coefficients/IndividualPersonDayPatternModel_psrcper1.F12 b/inputs/coefficients/IndividualPersonDayPatternModel_psrcper1.F12
@@ -1,8 +1,8 @@
 pattern020115.ALO   (SACOG2000 v020115)                                        
 Created by ALOGIT version 4                             13:27:04 on 31 Oct 13
 END
- 100   W-TASC   F    2.10000000000       .711850990254E-01
- 101   W-SASC   F    2.10000000000       .380234575323    
+ 100   W-TASC   F    1.9000000000       .711850990254E-01
+ 101   W-SASC   F    1.90000000000       .380234575323    
  102   W-PTW    F   -.963336457557       .636373073443E-01
  105   W-UNI    F   -1.05542075262       .189680237566    
  106   W-DAS    F   -2.96917323495       .215464716678    
@@ -27,7 +27,7 @@
  128  W-T-LOGS  F    .397931352085       .772888891560E-01
  129  W-S-LOGS  T    .000000000000       .000000000000    
  151   W-FTW    T    .000000000000       .000000000000    
- 200   S-TASC   F    .330655090209       .187743039870    
+ 200   S-TASC   F    .200000000000       .187743039870    
  201   S-SASC   F    1.32044771044       .405411603422    
  205   S-UNI    F    .686138722837       .201899972473    
  206   S-DAS    F    1.75526978216       .216560836880    
@@ -54,8 +54,8 @@
  228  S-T-LOGS  T    .10000000000        .000000000000    
  229  S-S-LOGS  T    .000000000000       .000000000000    
  251   S-FTW    T    .000000000000       .000000000000    
- 300   E-TASC   F   -2.39811091351       .220162252508    
- 301   E-SASC   F   -1.297929935833       .292960920252    
+ 300   E-TASC   F   -2.50000000000       .220162252508    
+ 301   E-SASC   F   -1.30000000000       .292960920252    
  302   E-PTW    T    .000000000000       .000000000000    
  303   E-RET    F   -.606524304703       .862700532565E-01
  304   E-NWA    T    .300000000000       .000000000000    
@@ -144,8 +144,8 @@
  528  H-T-LOGS  F    .100000000000       .572790181377E-01
  529  H-S-LOGS  F    .200000000000       .279510592738E-01
  551   H-FTW    T    .000000000000       .000000000000    
- 600   M-TASC   F   -3.029865396848       .174349433411    
- 601   M-SASC   F    .273900250479       .281207261398    
+ 600   M-TASC   F   -3.10000000000       .174349433411    
+ 601   M-SASC   F    .100000000000       .281207261398    
  602   M-PTW    F    .560633094794E-01   .797325497465E-01
  603   M-RET    T    .000000000000       .000000000000    
  604   M-NWA    T    .000000000000       .000000000000    

diff --git a/inputs/coefficients/OtherTourDestinationModel_psrcper1.F12 b/inputs/coefficients/OtherTourDestinationModel_psrcper1.F12
@@ -20,7 +20,7 @@
   17 Beta00017  T    .000000000000       .000000000000    
   18 Beta00018  T    .000000000000       .000000000000    
   19 Beta00019  T    .000000000000       .000000000000    
-  20 Beta00020  F    0.70000000000       .393401685812E-01
+  20 Beta00020  F    0.90000000000       .393401685812E-01
   21 Beta00021  F   -1.78217255731       1.62496440032    
   22 Beta00022  F   -3.50000000000       .340343443414    
   23 Beta00023  F   -2.30000000000     .188759809627    
@@ -36,7 +36,7 @@
   33 Beta00033  T    .000000000000       .000000000000    
   34 Beta00034  F    .000000000000       .332632023404E-01
   35 Beta00035  F    .00000000000000     .113610922701E-01
-  36 Beta00036  F    .900000000000       .530759462938E-01
+  36 Beta00036  F    1.100000000000       .530759462938E-01
   37 Beta00037  F   -0.9913686540       1.65419544073    
   38 Beta00038  F   -3.55707495694       .396103288788    
   39 Beta00039  F   -3.50603677901       .188319321670    
@@ -49,7 +49,7 @@
   46 Beta00046  F   -2.90586988718       .235425100821    
   47 Beta00047  F   -0.607973036778       .119508834113    
   48 Beta00048  F    .117316923405E-01   .314660325572E-01
-  49 Beta00049  F    .400000000000       .826529347708E-01
+  49 Beta00049  F    .700000000000       .826529347708E-01
   50 Beta00050  F   -1.2238797509       2.33464893627    
   51 Beta00051  F   -4.70000000000       .599172646607    
   52 Beta00052  F   -3.40000000000       .233930028473    

diff --git a/scripts/network/network_importer.py b/scripts/network/network_importer.py
@@ -193,7 +193,7 @@ def import_tolls(emmeProject):
     #@rdly:
     import_attributes(attr_file[2], scenario = emmeProject.current_scenario,
              revert_on_error=False)
-    emmeProject.network_calculator("link_calculation", result = "@rdly", expression = "@rdly * .50")
+    emmeProject.network_calculator("link_calculation", result = "@rdly", expression = "@rdly * .30")
 
 # set bridge/ferry flags