diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..7bd7181 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,8 @@ +include ez_setup.py +include README.rst +graft example_calm +graft example_calm_repop +graft example_survey_weighting +graft example_test +graft scripts +graft papers \ No newline at end of file diff --git a/README.rst b/README.rst index 5b468ea..c6149e5 100644 --- a/README.rst +++ b/README.rst @@ -5,4 +5,4 @@ PopulationSim is an open platform for population synthesis. It emerged from Oregon DOT's desire to build a shared, open, platform that could be easily adapted for statewide, regional, and urban transporation planning needs. PopulationSim is implemented in the -[ActivitySim](https://github.com/UDST/activitysim) framework. +[ActivitySim](https://github.com/activitysim/activitysim) framework. diff --git a/docs/docs.rst b/docs/docs.rst index 68f0b8e..f14d09d 100644 --- a/docs/docs.rst +++ b/docs/docs.rst @@ -4,22 +4,22 @@ .. _docs: -ActivitySim Resources -===================== +Resources +========= -1. `PopulationSim Repository `_ +1. `PopulationSim Software Repository `_ -2. `ActivitySim Project `_ +2. `PopulationSim Specification `_ -External Resources -================== +3. `2018 TRB paper `_ -1. `ODOT PopulationSim Specification `_ +4. `2018 TRB poster `_ -2. `ODOT 2018 TRB paper `_ +5. `ActivitySim Project `_ -3. `ODOT 2018 TRB poster `_ +External Resources +------------------ -4. `ODOT Resources Repository (setups, examples) `_ +1. `ODOT Resources Repository (setups, examples) `_ -5. `ODOT Complete Python 2 setup for PopulationSim `_ +2. `ODOT Complete Python 2 setup for PopulationSim `_ diff --git a/docs/getting_started.rst b/docs/getting_started.rst index 0c2363d..b775cfc 100644 --- a/docs/getting_started.rst +++ b/docs/getting_started.rst @@ -67,8 +67,6 @@ Python 2 or 3? Run Examples ------------ - * Before running examples, ensure that Anaconda Python, dependent libraries and PopulationSim package have been installed. - There are three examples for running PopulationSim, two created using data from the Corvallis-Albany-Lebanon Modeling (CALM) region in Oregon and the other using data from the Metro Vancouver region in British Columbia. The `example_calm`_ set-up runs PopulationSim in base mode, where a synthetic population is created for the entire modeling region. This takes approximately 12 minutes on a laptop with an Intel i7-4800MQ CPU @ 2.70GHz and 16 GB of RAM. The `example_calm_repop`_ set-up runs PopulationSim in the *repop* mode, which updates the synthetic population for a small part of the region. The `example_survey_weighting`_ set-up runs PopulationSim for the case of developing final weights for a household travel survey. More information on the configuration of PopulationSim can be found in the **Application & Configuration** section. Example_calm diff --git a/papers/Draft TM1 - Population Synthesis Technical Specifications 2017-03-08.pdf b/papers/Draft TM1 - Population Synthesis Technical Specifications 2017-03-08.pdf new file mode 100644 index 0000000..c36ceeb Binary files /dev/null and b/papers/Draft TM1 - Population Synthesis Technical Specifications 2017-03-08.pdf differ diff --git a/papers/TRBPoster_PaulDoyleStablerFreedmanBettinardi_v5[1].pptx b/papers/TRBPoster_PaulDoyleStablerFreedmanBettinardi_v5[1].pptx new file mode 100644 index 0000000..d32e52a Binary files /dev/null and b/papers/TRBPoster_PaulDoyleStablerFreedmanBettinardi_v5[1].pptx differ diff --git a/papers/TRB_Paper_PopulationSim_v6.pdf b/papers/TRB_Paper_PopulationSim_v6.pdf new file mode 100644 index 0000000..a739f54 Binary files /dev/null and b/papers/TRB_Paper_PopulationSim_v6.pdf differ diff --git a/setup.py b/setup.py index 4e8d32a..8534aaa 100644 --- a/setup.py +++ b/setup.py @@ -24,6 +24,7 @@ ], long_description=long_description, packages=find_packages(exclude=['*.tests']), + include_package_data=True, python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*', install_requires=[ 'numpy >= 1.16.1',