Skip to content

Hema #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
hemaSR wants to merge 681 commits into
base: master
Choose a base branch
from
Open

Hema #14

hemaSR wants to merge 681 commits into from

Conversation

@hemaSR
Copy link

@hemaSR hemaSR commented Feb 28, 2018

MarriageDivorceCalcMuc update

nkuehnel and others added 30 commits October 10, 2017 18:18
@nkuehnel
adjust write output method for non existing parent directories
7b6ac09
@nkuehnel
Merge branch 'master' of https://github.com/msmobility/silo
db882f3
@nkuehnel
quick fix for #33
f7e874b
@nkuehnel
make implementation an enum
0a26f06
@nkuehnel
switch matsim dependency to "compile" scope and also use version 0.10…
f403d64 
… snapshot
@kainagel
reduce public footprint of code
a2fed16
@matthewokrah
Implemented Javascript for Car Ownership Update
6e64f21 
Fixes #10
@kainagel
pull standard silo and siloCSDMS apart
80eed31
@kainagel
more pulling apart
c1b66e4
@dziemke
adjust to mito travel times interface
c707480
@moeckel
Added placeholder to change schools and to add drivers licenses. Curr…
f6a21c7 
…ent implementation has very simply rules if these events occur.
@moeckel
Accessibility class is not used as a static class anymore. Instead, A…
6b00007 
…ccessibility was added to the model container.
@dziemke
move matsim classes to matsim package
85eb02b
@dziemke
revise silomatsim classes
91a80d8
@dziemke
create matsim travel times and make availbale in silo
0e4277a
@matthewokrah
Merge master into branch
54ff433
@nkuehnel
use interface for car update models. divide into munich and maryland …
a2719d4 
…car update model. use both at the same places throughout the simulation. needed major changes in code layout
@nkuehnel
Merge pull request #37 from msmobility/mokrah
f98739c 
Mokrah - Update Car Ownership Model with Javascript
@atmoreno
Merge remote-tracking branch 'origin/master'
c0b42a8
@matthewokrah
Merge master into branch
5dca674
@moeckel
Added some comments to improve readability.
60acbda
@moeckel
Added events counter for auto-ownership changes and added timer for a…
8946934 
…uto-ownership model.
@matthewokrah
Merge branch 'master' of https://github.com/msmobility/silo into mokrah
17e4222 
renamed SyntheticPopulationGenerator as syntheticPopulationGenerator
@matthewokrah
Merge branch 'master' of https://github.com/msmobility/silo into mokrah
ee08ae5
@atmoreno
Merge branch 'master' of https://github.com/msmobility/silo
f1c2618
@dziemke
Merge branch 'master' of https://github.com/msmobility/silo.git
7777d44 
Conflicts:
	src/main/java/de/tum/bgu/msm/SiloModel.java
	src/main/java/de/tum/bgu/msm/transportModel/SiloMatsimController.java
@dziemke
adjust imports
09711a5
@dziemke
add initial matsim run to fill accessibilities; refers to #38
ccfc85f
@dziemke
provide different ways to initialize accessibilities; fixes #38
e4b8351
@dziemke
minor
ece2e09
moeckel and others added 30 commits February 14, 2018 15:39
@moeckel
Ignore csv files.
64d74ee
@nkuehnel
remove legacy code
49baa75
@nkuehnel
check for existing dwelling first when querying homezone of household
ed106c5
@nkuehnel
replace inefficient toArray call with direct collection call
61610cd
@nkuehnel
formatting
d44f914
@nkuehnel
some more formatting in accessibility class
eab3159
@nkuehnel
reduce duplicated code
94a3df1
@nkuehnel
more formatting; revise regional travel time calculation and put it u…
b624675 
…nder test; reuse matsim travel times object over iterations and update it; remove accessibility dependence from matsim transport model
@nkuehnel
add regional traavel time test reference file
42dcee5
@nkuehnel
remove legacy code
848088a
@nkuehnel
retry zone to region travel time reference
3888fe4
@nkuehnel
speed up regional utility calculation for munich;
20a816d 
initialize moves model with accessibility model and simplify moves model interface;
@nkuehnel
adjust to spatia objects and remove some deprecated geodata methods
59bcf2a
@nkuehnel
remove deprecated method
18462b8
@nkuehnel
fix bug in marry divorce model:
ee9722f 
first person for each gender and age combination was not added to
the marriage market
@cllorca1
supressed warning after checking calculations. Fixes #22
86cdbe2
@cllorca1
vacancy rates higher than 1 forced to 1
3317483
@nkuehnel
some cleanup; replace year yrrays with sets in SiloModel
5408f86
@hemaSR
+MarryDivorceCalcMuc
52779b0
@hemaSR
Merge pull request #75 from msmobility/hema
96d35de 
MarryDivorceCalcMuc
@moeckel
Added safety if-statement. When running the model with a smaller numb…
447b114 
…er of household, this method produced an error. That problem should be fixed now.
@nkuehnel
update demolition model. fixes #59
af22d2c
@nkuehnel
put demolition calc test back
e4b18d9
@nkuehnel
package for models
a92119c
@hemaSR
Update MarryDivorceCalcMuc
5e75bd8
@hemaSR
Merge branch 'master' of https://github.com/msmobility/silo into hema
4503157
@nkuehnel
refactor accessibilityTest
8cdfffb
@nkuehnel
try to fix accessibility test on travis
31551a9
@nkuehnel
muc demolition calc update
d4879df
@hemaSR
Merge branch 'master' of https://github.com/msmobility/silo into hema
af7d577
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@hemaSR @nkuehnel @cllorca1 @kainagel @matthewokrah @dziemke @moeckel @atmoreno