Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
cf531a5
Provide more flexibility for defining mandatory schedule specifications.
Dec 5, 2019
7233d1b
provide more flexibility for time periods.
Dec 5, 2019
b183297
Improve consistency in slicing and fix code syntax issues.
Dec 5, 2019
8332226
Consistency and code syntax.
Dec 5, 2019
b511456
code syntax.
Dec 5, 2019
bfc6191
code syntax fixes.
Dec 5, 2019
988a935
syntax fix.
Dec 5, 2019
c9f890e
Add necessary change to test script settings.
Dec 5, 2019
333f13b
Modify relevant section of the settings.yml for tests and examples.
Dec 5, 2019
4bb9541
restore 'hours' as deprecated for backwards compatibility.
Dec 10, 2019
ca17f3e
Add default value for period_minutes for backwards compatibilitiy.
Dec 10, 2019
174b5e6
create develop branch so we can merge features here before merging (r…
bstabler Dec 17, 2019
7db24a6
Merge pull request #275 from danielsclint/ft_schedule_flex
bstabler Dec 17, 2019
3de1879
provide more flexibility for time periods.
Dec 5, 2019
c546f7c
Improve consistency in slicing and fix code syntax issues.
Dec 5, 2019
2272b4c
Consistency and code syntax.
Dec 5, 2019
3ebfcbe
code syntax fixes.
Dec 5, 2019
0795ec0
Modify relevant section of the settings.yml for tests and examples.
Dec 5, 2019
a5654a5
restore 'hours' as deprecated for backwards compatibility.
Dec 10, 2019
59dddfe
Add default value for period_minutes for backwards compatibilitiy.
Dec 10, 2019
7751fe9
Merge branch 'ft_time_period_flex' of https://github.com/danielsclint…
Dec 20, 2019
82b6b72
Fix overflows
Dec 20, 2019
345e666
Complete testing of the flexible time periods.
Dec 20, 2019
d3597cd
pep8
Dec 21, 2019
889159b
test some floats too.
Dec 21, 2019
772cb34
pep8
Dec 21, 2019
e7664da
Merge pull request #276 from danielsclint/ft_time_period_flex
bstabler Dec 27, 2019
efc2bc6
Merge pull request #286 from danielsclint/ft_overflow
bstabler Dec 27, 2019
32dc999
start with csvs and write hdf5 outputs if desired (#290)
bstabler Feb 3, 2020
9d21d81
Update travis.yml
Feb 3, 2020
1f02ce7
Pandas 1.0 fixes
Feb 4, 2020
925d40e
Location and mode choice logsums (#298)
bstabler Feb 27, 2020
f3955ec
Deprecate Py2 and add CLI
Mar 7, 2020
4255f03
Tncs (#14)
bstabler Mar 24, 2020
4ff7510
write trip matrices (#311)
bstabler Apr 13, 2020
1041bf6
small fixes for semcog deployment (#319)
bstabler May 6, 2020
efe66b3
major work on phase 5 (#325)
bstabler Jul 29, 2020
05a25f6
additional updates for estimation integration (#328)
bstabler Aug 11, 2020
fba45b3
update license, fix univ coeff bug, update estimation example (#339)
bstabler Sep 3, 2020
e6b8de1
Merge branch 'master' into develop
bstabler Sep 3, 2020
205c391
add license to package (#341)
bstabler Sep 4, 2020
f76f9c0
move notebooks to examples folder so they are installed and update do…
bstabler Sep 10, 2020
4393b5e
Merge branch 'master' into develop
bstabler Sep 10, 2020
152b359
Merge branch 'develop' of https://github.com/ActivitySim/activitysim …
bstabler Sep 10, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

include ez_setup.py
include README.rst
graft notebooks
graft activitysim/examples

# required for test system
Expand Down
2 changes: 1 addition & 1 deletion activitysim/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ActivitySim
# See full license in LICENSE.txt.

__version__ = '0.9.5'
__version__ = '0.9.5.1'
__doc__ = 'Activity-Based Travel Modeling'
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
}
],
"source": [
"!pip install https://github.com/activitysim/activitysim/zipball/develop"
"!pip install activitysim"
]
},
{
Expand Down
10 changes: 5 additions & 5 deletions docs/gettingstarted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ ActivitySim includes a `Jupyter Notebook <https://jupyter.org>`__ recipe book wi
* Open an Anaconda prompt and activate the Anaconda environment with ActivitySim installed
* If needed, ``conda install jupyterlab`` so you can run jupyter notebooks
* Type ``jupyter notebook`` to launch the web-based notebook manager
* Navigate to the notebooks folder and select a notebook to learn more:
* Navigate to the examples notebooks folder and select a notebook to learn more:

* `Getting started <https://github.com/activitysim/activitysim/blob/develop/notebooks/getting_started.ipynb/>`__
* `Summarizing results <https://github.com/activitysim/activitysim/blob/develop/notebooks/summarizing_results.ipynb/>`__
* `Testing a change in auto ownership <https://github.com/activitysim/activitysim/blob/develop/notebooks/change_in_auto_ownership.ipynb/>`__
* `Adding TNCs <https://github.com/activitysim/activitysim/blob/develop/notebooks/adding_tncs.ipynb/>`__
* `Getting started <https://github.com/activitysim/activitysim/blob/master/notebooks/getting_started.ipynb/>`__
* `Summarizing results <https://github.com/activitysim/activitysim/blob/master/notebooks/summarizing_results.ipynb/>`__
* `Testing a change in auto ownership <https://github.com/activitysim/activitysim/blob/master/notebooks/change_in_auto_ownership.ipynb/>`__
* `Adding TNCs <https://github.com/activitysim/activitysim/blob/master/notebooks/adding_tncs.ipynb/>`__

Hardware
--------
Expand Down