Clean up tests so they work.

Fast-Trips · May 8, 2017 · f1a34b8 · f1a34b8
1 parent 52fbbda
commit f1a34b8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 21 deletions.
diff --git a/Examples/test_scenario/demand_twopaths/config_ft.txt b/Examples/test_scenario/demand_twopaths/config_ft.txt
@@ -1,5 +1,4 @@
 [fasttrips]
-number_of_processes           = 5
 trace_ids                     = [('frogger','1'),('paperboy','1'),('marge','1'),('maggie','1')]
 bump_one_at_a_time            = True
 simulation                    = True

diff --git a/Examples/test_scenario/network/config_ft.txt b/Examples/test_scenario/network/config_ft.txt
diff --git a/README.md b/README.md
@@ -291,7 +291,7 @@ __Feedback:__ `test_feedback.py`
 
 __Dispersion Levels:__ `test_dispersion.py`
 
- *  Runs dispersion levels 0.1 to 1.0 at 0.1 increments
+ *  Runs dispersion levels 0.1 to 1.0 at varying increments
 
 __User Classes:__ `test_user_classes.py`
 

diff --git a/fasttrips/Run.py b/fasttrips/Run.py
@@ -109,7 +109,7 @@ def run_setup(input_network_dir,
         fasttrips.Assignment.MAX_ITERATIONS          = int(iters)
 
     if kwargs.has_key("number_of_processes"):
-        fasttrips.Assignment.NUMBER_OF_PROCESSES = kwarge["number_of_processes"]
+        fasttrips.Assignment.NUMBER_OF_PROCESSES = kwargs["number_of_processes"]
 
     if trace_only:
         if len(fasttrips.Assignment.TRACE_IDS) == 0:

diff --git a/tests/test_dispersion.py b/tests/test_dispersion.py
@@ -15,7 +15,7 @@ def test_dispersion():
     INPUT_DEMAND   = os.path.join(EXAMPLES_DIR,"demand_reg")
     OUTPUT_DIR     = os.path.join(EXAMPLES_DIR,"output")
 
-    for d in [1.0, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1]: 
+    for d in [1.0, 0.7, 0.5, 0.4, 0.1]: 
 
         full_output_dir = os.path.join(OUTPUT_DIR,"test_dispers_%4.2f" % d)
         if not os.path.exists(full_output_dir): os.mkdir(full_output_dir)
@@ -29,7 +29,8 @@ def test_dispersion():
             output_folder    = "test_dispers_%4.2f" % d,
             pathfinding_type = "stochastic",
             iters            = 1,
-            dispersion       = d )
+            dispersion       = d,
+            test_size        = 100 )
 
         print "FINISHED RUN"
         assert r["passengers_arrived"] > 0