Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
4d99860
Added seperate main files for each simulation method
Jun 7, 2019
11bf141
begin param-search
Jun 8, 2019
137793e
Modify analysis classes to give details and create parameter search f…
Jun 12, 2019
305cd98
Fix main cmake
Jun 12, 2019
a9c1626
Cleanup
Jun 12, 2019
05d8afe
Add working parameter search
Jun 13, 2019
c70b3f9
Finish scoring function for parameter search
Jun 14, 2019
9abefee
Fixed compile error
johnastratton Jun 14, 2019
d314a6f
Fixed param search main
Jun 14, 2019
ea48755
Merge branch 'paramsearch' of https://github.com/johnastratton/DENSE …
Jun 14, 2019
a2a5213
cleanup
Jun 14, 2019
573451a
new branch for expiriments
Jun 19, 2019
feee1fc
start rejection based sim
Jun 25, 2019
2072c46
finish groups class
Jun 25, 2019
b13e6f4
worked on rejection based simulation
Jul 1, 2019
b011442
add sorting direct method
ruilong96 Jul 4, 2019
22cdd37
added Anderson's modified next reaction method
Jul 5, 2019
4c1f203
Rejection-based simulation compiles. Still needs some debugging
Jul 8, 2019
b60e4de
we get a first time entry!
Jul 9, 2019
b7973f0
sometimes runs fully!
Jul 10, 2019
73f5d96
it runs nowgit add .
Jul 12, 2019
51270a9
finished rejection based simulation
Jul 12, 2019
c268d0e
works for every model except BZ
Jul 13, 2019
48f308d
adding new model
Jul 15, 2019
f6147b2
rebase
Jul 15, 2019
b01df5e
Rejection based simulation donegit add .
Jul 15, 2019
fceeb84
improved efficiency with concentration bounds
Jul 18, 2019
91ae341
pushing new branch
Jul 22, 2019
8095a2d
new push
Jul 22, 2019
029299f
Added weighted random index selector
johnastratton Jul 22, 2019
ed824f4
Implemented binary tree
Jul 24, 2019
d946982
Finished implementing binary chooser
Jul 25, 2019
7580896
Merge pull request #99 from johnastratton/binary_search
Jul 25, 2019
6d2381f
fixed the sim builder
NickRMcCellan Jul 25, 2019
ed431f2
uhhhh
NickRMcCellan Jul 25, 2019
9c291cf
added benchmark tool get_performance for all simulation methods
YIWENXYW Jul 25, 2019
4f3c406
Merge branch 'expiriments' of https://github.com/johnastratton/DENSE …
YIWENXYW Jul 25, 2019
8ac54a1
Update Sim_Builder.hpp
NickRMcCellan Jul 25, 2019
8543da8
rebased with dev
NickRMcCellan Jul 26, 2019
a28a3c8
added the sorting direct method
NickRMcCellan Jul 29, 2019
237e3fb
added a seed message to the rejection algorithm
NickRMcCellan Jul 29, 2019
f5fd516
added the get_performace measurements to sorting direct method
NickRMcCellan Jul 29, 2019
ced4114
Merge pull request #91 from johnastratton/anderson
YIWENXYW Jul 31, 2019
3f3948a
Merge branch 'expiriments' into exact-stochastic-evaluation
YIWENXYW Jul 31, 2019
275cee6
Merge pull request #100 from johnastratton/exact-stochastic-evaluation
YIWENXYW Jul 31, 2019
c4fed3a
Update propensity_groups.hpp
Jul 31, 2019
9cc49c2
added weight sum tree
YIWENXYW Aug 1, 2019
0c739d3
added weighted sum tree
YIWENXYW Aug 1, 2019
8a8a6b5
Refactored heap into separate mix-in of complete_tree
johnastratton Aug 2, 2019
05646c6
Refactored indexed priority queue and fixed up merge issues
johnastratton Aug 3, 2019
90fe2a6
Added log direct method using a heap-based random selector
johnastratton Aug 5, 2019
6c04f93
Some changes to log direct method - trying to clean up repo
NickRMcCellan Aug 9, 2019
a61dbe5
Fixed log_direct_method - tests running and passing
johnastratton Aug 12, 2019
17ffc01
Update rejection_based_simulation.hpp
Aug 12, 2019
716e79f
Update rejection_based_simulation.cpp
Aug 12, 2019
d1c42cd
Update anderson_next_reaction_simulation.hpp
Sep 4, 2019
c9b1a6b
Update anderson_next_reaction_simulation.cpp
Sep 4, 2019
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "test/ndiff"]
path = test/ndiff
url = https://github.com/quinoacomputing/ndiff.git
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ string(REPLACE ";" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} "
"-g -fconcepts -pedantic -fmax-errors=3 -Wall -Wextra -Werror -Wcast-align -Wcast-qual -Wctor-dtor-privacy "
"-Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wno-type-limits "
"-Wnoexcept -Woverloaded-virtual -Wredundant-decls -Wstrict-null-sentinel -Wstrict-overflow=1 "
"-Wswitch-default -Wundef -Wunused -Wzero-as-null-pointer-constant -Wuseless-cast -Wsuggest-override -fopenmp")
"-Wswitch-default -Wundef -Wunused -Wzero-as-null-pointer-constant -Wuseless-cast -Wsuggest-override -fopenmp")
if(COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
elseif(COMPILER_SUPPORTS_CXX0X)
Expand Down
Binary file added models/Belousov-Zhabotinksy/anderson
Binary file not shown.
Binary file added models/Belousov-Zhabotinksy/fast_gillespie
Binary file not shown.
Binary file added models/Belousov-Zhabotinksy/gillespie
Binary file not shown.
Binary file added models/Belousov-Zhabotinksy/nextreaction
Binary file not shown.
23 changes: 23 additions & 0 deletions models/Belousov-Zhabotinksy/param_grad_template.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# CSV Specification
# Ignored by the file readers are:
# (1) Empty cells / Blank rows / Whitespace
# (2) Comment whose rows always begin with a '#'
# For best results delete all comments before loading this file into any Excel-like program.
# (3) Any cell which does not conform to the scientific notation format 3.14e-41 or simple whole numbers and decimals
# Often times cells which do not contain numbers are intended to be column headers. These are not parsed by the simulation and can technically be modified by the users as they wish.
# It is futile to add/remove/modify the column headers with the expectation of changing the program's behavior. Data must be entered in the default order for it to be parsed correctly.
# None of these comments include commas because it messes with the column widths when loaded into Excel-like programs.
# For more information and examples see README.md section 2.2.0

# Rename this file by removing the "_template" from the file name (or just change the name entirely) once the data has been entered!
# This file should only contain one set of gradients. Only this one gradients setting is applied to all parameter sets when a simulation set is being run.
# Use '0' under all four columns of a reaction to indiate that it should not have a gradient.
# Gradient Codes
# x1 - start column
# y1 - start multiplier (use '1.23' to mean '123%')
# x2 - end column
# y2 - end multiplier
# For more information and examples see README.md section 2.2.2

grad_x1_br_synthesis, grad_y1_br_synthesis, grad_x2_br_synthesis, grad_y2_br_synthesis, , grad_x1_fe2_reaction, grad_y1_fe2_reaction, grad_x2_fe2_reaction, grad_y2_fe2_reaction, , grad_x1_fe3_reaction, grad_y1_fe3_reaction, grad_x2_fe3_reaction, grad_y2_fe3_reaction, , grad_x1_fe2_synthesis, grad_y1_fe2_synthesis, grad_x2_fe2_synthesis, grad_y2_fe2_synthesis, , , ,
0, 0, 0, 0, , 0, 0, 0, 0, , 0, 0, 0, 0, , 0, 0, 0, 0, , , ,
18 changes: 18 additions & 0 deletions models/Belousov-Zhabotinksy/param_pert_template.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# CSV Specification
# Ignored by the file readers are:
# (1) Empty cells / Blank rows / Whitespace
# (2) Comment whose rows always begin with a '#'
# For best results delete all comments before loading this file into any Excel-like program.
# (3) Any cell which does not conform to the scientific notation format 3.14e-41 or simple whole numbers and decimals
# Often times cells which do not contain numbers are intended to be column headers. These are not parsed by the simulation and can technically be modified by the users as they wish.
# It is futile to add/remove/modify the column headers with the expectation of changing the program's behavior. Data must be entered in the default order for it to be parsed correctly.
# None of these comments include commas because it messes with the column widths when loaded into Excel-like programs.
# For more information and examples see README.md section 2.2.0

# Rename this file by removing the "_template" from the file name (or just change the name entirely) once the data has been entered!
# This file should only contain one set of perturbations. Only this one perturbations set is applied to all parameter sets when a simulation set is being run.
# Use '0' to indicate that a reaction should not have perturbations.
# For more information and examples see README.md section 2.2.2

pert_br_synthesis, pert_fe2_reaction, pert_fe3_reaction, pert_fe2_synthesis, , ,
0, 0, 0, 0, , ,
5 changes: 2 additions & 3 deletions models/Belousov-Zhabotinksy/param_sets.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
br_synthesis, fe2_reaction, fe3_reaction, fe2_synthesis, , ,
0,0,0,0, , ,
1,1,1,1,,,
br_synthesis, fe2_reaction, fe3_reaction, fe2_synthesis, ,
1,1,1,1, ,
16 changes: 16 additions & 0 deletions models/Belousov-Zhabotinksy/param_sets_template.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# CSV Specification
# Ignored by the file readers are:
# (1) Empty cells / Blank rows / Whitespace
# (2) Comment whose rows always begin with a '#'
# For best results delete all comments before loading this file into any Excel-like program.
# (3) Any cell which does not conform to the scientific notation format 3.14e-41 or simple whole numbers and decimals
# Often times cells which do not contain numbers are intended to be column headers. These are not parsed by the simulation and can technically be modified by the users as they wish.
# It is futile to add/remove/modify the column headers with the expectation of changing the program's behavior. Data must be entered in the default order for it to be parsed correctly.
# None of these comments include commas because it messes with the column widths when loaded into Excel-like programs.
# For more information and examples see README.md section 2.2.0

# Rename this file by removing the "_template" from the file name (or just change the name entirely) once the data has been entered!
# This file can contain more than one set (each being on their own line). All sets are initialized and executed in parallel when a file is loaded into the simulation.
# For more information and examples see README.md section 2.2.1

br_synthesis, fe2_reaction, fe3_reaction, fe2_synthesis, , ,
Loading