Merge remote-tracking branch 'upstream/master'

# Conflicts: # .gitignore
danielsclint · Jun 29, 2018 · 3f40a4a · 3f40a4a
2 parents feaa9a3 + 0ba43be
commit 3f40a4a
Show file tree

Hide file tree

Showing 287 changed files with 3,397,006 additions and 5,647 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 *.swp
 *.so
 *.bak
+.cache/*
+*.zip
 
 **/Examples/**/output
 **/Examples/**/output_bak
@@ -11,10 +13,13 @@ create_tableau_path_map/*
 
 # Distribution / packaging
 build/
+dist/
+fasttrips.egg-info/
 
 # test
 sfcta/
 psrc/
 
 #PyCharm IDE Files
 .idea/
+
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,30 @@
+language: python
+python:
+  - "2.7.13"
+
+install:
+  - sudo apt-get update
+  # We do this conditionally because it saves us some downloading if the
+  # version is the same.
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+      wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
+    else
+      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+    fi
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -q conda
+  # Useful for debugging any issues with conda
+  - conda info -a
+
+  # Replace dep1 dep2 ... with your dependencies
+  - conda create -q -y -n test-environment python=$TRAVIS_PYTHON_VERSION numpy pandas=0.22 psutil pytest
+  - source activate test-environment
+  - pip install -r requirements.txt
+  - pip install .
+script:
+- if [ "$TRAVIS_BRANCH" == "master" ] | [ "$TRAVIS_BRANCH" == "develop" ]; then travis_wait 70 py.test -v -m travis;
+  else travis_wait 30 py.test -v -m basic;
+  fi
diff --git a/CHANGES.md b/CHANGES.md
@@ -0,0 +1,20 @@
+## Changelog
+
+Major changes to fast-trips since the original FAST-TrIPs (https://github.com/MetropolitanTransportationCommission/FAST-TrIPs-1)
+
+To be filled in further but including:
+* Added pathfinding iterations to looping (so pathfinding_iteration=1 finds paths for everyone, and subsequently just find paths for people who don't have a valid path. Break when max or we don't find anymore)
+* Added time-period based drive access links (10/2016)
+* Added link distance to extension as part of StopState (10/2016)
+* Implemented overlap pathsize correction (8/2016)
+* Add purpose segmentation to cost weighting (7/2016)
+* Output pathsets in addition to chosen paths (4/2016)
+* Update transit trip vehicle times based on boards, alights and vehicle-configured accleration, deceleration and dwell formulas (4/2016)
+* Output performance measures (pathfinding and path enumeration times, number of stops processed) (3/2016)
+* Stop order update to pathfinding: when a stop state is updated, mark other reachable stops for reprocessing (3/2016) [details][stop-order-details-url]
+* Support KNR and PNR access (11/2015)
+* Read user-class based cost weighting (11/2015)
+* Switch input format to GTFS-plus network (10/2015)
+* Move path finding to C++ extension (9/2015)
+* Parallelized path finding with multiprocessing (7/2015)
+* Port original FAST-TrIPs codebase to python with debug tracing (5/2015)
diff --git a/Examples/test_network/demand_reg/config_ft.txt b/Examples/test_network/demand_reg/config_ft.txt
diff --git a/Examples/test_network/demand_reg/pathweight_ft.txt b/Examples/test_network/demand_reg/pathweight_ft.txt
diff --git a/Examples/test_network/demand_twopaths/config_ft.txt b/Examples/test_network/demand_twopaths/config_ft.txt
diff --git a/Examples/test_network/demand_twopaths/pathweight_ft.txt b/Examples/test_network/demand_twopaths/pathweight_ft.txt
diff --git a/Examples/test_network/input/drive_access_ft.txt b/Examples/test_network/input/drive_access_ft.txt
diff --git a/Examples/test_network/input/fare_attributes.txt b/Examples/test_network/input/fare_attributes.txt
diff --git a/Examples/test_network/input/fare_attributes_ft.txt b/Examples/test_network/input/fare_attributes_ft.txt
diff --git a/Examples/test_network/input/fare_rules.txt b/Examples/test_network/input/fare_rules.txt
diff --git a/Examples/test_network/input/fare_rules_ft.txt b/Examples/test_network/input/fare_rules_ft.txt
diff --git a/Examples/test_network/input/fare_transfer_rules_ft.txt b/Examples/test_network/input/fare_transfer_rules_ft.txt
diff --git a/Examples/test_network/input/routes_ft.txt b/Examples/test_network/input/routes_ft.txt
diff --git a/Examples/test_network/input/shapes.txt b/Examples/test_network/input/shapes.txt