Skip to content
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

Master #17

Open
wants to merge 136 commits into
base: master
Choose a base branch
from
Open

Master #17

wants to merge 136 commits into from

Conversation

ZuowenWang0000
Copy link

No description provided.

hornel and others added 30 commits October 22, 2017 22:39
@hornel
Update README.md
6274787
Added research proposal
93a2070
Added flash talk slide
9b7f077
@johannahed
06.11.17
aee4c25
Added some function skeletons
f4a1864
Performed basic initialization of the position matrix
6cade8c
Added some comments on the structure of the position matrix
a748bad
More efficient initialization of ArrayLists
8d19c5d
Parallelized initialization of matrix
d22980d
@hornel
Added some notes about iterating through sectors
b4601fc
@hornel
Added some more general notes
5d3c9aa
Updated code to use LinkedList (more efficient removal)
61ea163
Initialized individuals with random coordinates
5be3f5f
Implemented getNeighbors
5ff4aa8
"Updated skeleton to remove unnecessary functions"
dd3fb4e
"Assigned random velocity to individuals"
23e4e0a
"Run one timestep in test"
dface21
"Created skeleton for running one timestep"
775aa16
@hornel
Updated README
d52820c
@hornel
Added some comments
af7751a
@johannahed
Update runOneTimestep.m
bcad73d
@hornel
Implemented new function from code.m. Iterating over neighbors using …
d3fcbd2 
…for loop.
@hornel
Added location of code skeleton
c2da9cd
Changed parameters from paper into globals. Adjusted calculation of f…
3d6ab27 
…orces according to paper.
create plot
80fb418
a script to display the matrix
bb88073
@hornel
Created temporary plotting solution. Refined plotMatrix.
4db6d65
Fixed bugs related to vector dimensions
818a3cd
@hornel
Fixed more bugs related to vector dimensions
2b54ea5
@hornel
Fixed one more dimension-related bug
8c920bc
mrPaga and others added 30 commits December 9, 2017 19:22
@mrPaga
phase diagram for analysis of single out.py file
96e90f0
@hornel
Added comments & cleaned up code. DataCollector now creates __init__.py.
991ab17
@mrPaga
phase diagram for multiple 'out%s.py' files
8e7c78e
@johannahed
Create timeEvolution.py
64797fa 
plots the time evolution of the maximum danger level and the average danger level
until now, the file needs to be in the same folder in which the ou_i_j files are saved
@johannahed
Rename timeEvolution.py to java_code/timeEvolution.py
e503de6
@hornel
Fixed bug in DataCollector & enabled importing from different folders
c45989c
@johannahed
uploaded some new config files
6f3b4c2
@hornel
Removed print statements from timeEvolution and DataCollector
f6a31ab
change graph ouput format to png
ec33ae3
@hornel
Added compatibility with Java 5
9784b90
modifid the scirpts to call multiple graphs
cce3397
@johannahed
added some new configs
938aa3b
@hornel
Changed config parameters to be uniform for data collection
08a3007
@hornel
Increased compatibility with Java 5. Fixed bugs in config files.
611c320
@hornel
Now outputting continuous danger levels and median danger level
39d8ae3
@johannahed
timeEvolution plots median instead of average
ac18dda
@johannahed
new version
6a6d808
modify phase_diagram_multi
7078bf7
@mrPaga
density and forces to continuousDangerLevel phase diagram
e1a115c
@hornel
Updated configGuide to match the report
bae01b0
@hornel
Merge remote-tracking branch 'origin/master'
41e511a
@hornel
Cleaned up code to wrap to 80 columns (to fit in report)
2e00eff
@hornel
Hopefully fixed bug due to encoding of Greek letters
3d83bf4
@johannahed
Update timeEvolution.py
a56422e 
added isParticipating (time evolution)
@johannahed
Update timeEvolution.py
4faecf3 
entgültige Version
@johannahed
Update timeEvolution.py
bba9ba7 
changed colors in plot
@johannahed
Update timeEvolution.py
88bb0c5 
entgültig nr 2 :)
@hornel
Cleaned up Python code
9605dc4
@hornel
Added report
71ce571
@hornel
New version of report
be40464
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.

None yet
4 participants
@ZuowenWang0000 @hornel @johannahed @mrPaga