base model r8207, **old deteriorate** condition
- `svn merge -r HEAD:8207 .`
9 lines of code changed in 4 files:
run G0E: GOS-linked, no attention restriction, extreme predation, N 1000
- `svn merge -r HEAD:8216 .`
3 lines of code changed in 2 files:
run P0E: Full predictive, no attention restriction, extreme predation, N1000
3 lines of code changed in 2 files:
run P1E: Full predictive, full attention, extreme predation, N=1000
- `svn merge -r HEAD:8211 .`
- **relax deteriorate condition** to allow N=1 alive
3 lines of code changed in 2 files:
run G1E: GOS-linked, full attention, extreme predation, N 1000
- `svn merge -r HEAD:8212 .`
- **relax deteriorate condition** to allow N=1 alive
6 lines of code changed in 3 files:
base model r8207
- `svn merge -r HEAD:8207 .`
4 lines of code changed in 2 files:
Added new function for saving to binary files.
20 lines of code changed in 1 file:
Work in progress
152 lines of code changed in 1 file:
run G1E: GOS-linked, full attention, extreme predation, N 1000
3 lines of code changed in 2 files:
run P1E: Full predictive, full attention, extreme predation, N=1000
6 lines of code changed in 2 files:
run P0H: Full predictive, no attention restriction, high predation, N1000
3 lines of code changed in 2 files:
run G0H: GOS-linked, no attention restriction, high predation, N 1000
3 lines of code changed in 2 files:
run G1H: GOS-linked, full attention, high predation, N 1000
3 lines of code changed in 2 files:
run P1H: Full predictive, full attention, high predation, N 1000
1 lines of code changed in 1 file:
fixed bug in fitness: (fitness_energy_reprfact)
7 lines of code changed in 1 file:
base model r8199
- `svn merge -r HEAD:8199 .`
4 lines of code changed in 2 files:
G1E: GOS-linked, full attention, extreme predation, large N 1000
3 lines of code changed in 2 files:
run P1E: Full predictive, full attention, extreme predation, N=1000
6 lines of code changed in 2 files:
run P0H: Full predictive, no attention restriction, high predation, N1000
3 lines of code changed in 2 files:
run G0H: GOS-linked, no attention restriction, high predation, N 1000
3 lines of code changed in 2 files:
run G1H: GOS-linked, full attention, high predation, N 1000
3 lines of code changed in 2 files:
run P1H: Full predictive, full attention, high predation, N 1000
1 lines of code changed in 1 file:
base model modified parameters
- fitness based on energy and reproductive factor
- small population 1000
- minuscle variability of birth stomach
- fix real(SRP) in fitness functions parameters
45 lines of code changed in 2 files:
basic state is r8188 (`svn merge -r HEAD:8188 .`)
4 lines of code changed in 2 files:
run G1E: GOS-linked, full attention, extreme predation, large N 10000
- `svn merge -r HEAD:8189 .`
- change predation
3 lines of code changed in 2 files:
run P1E: Full predictive, full attention, extreme predation, large N=10000
- fixed model name and tags ln 1943, was wrong in r8194
2 lines of code changed in 1 file:
run P1E: Full predictive, full attention, extreme predation, large N=10000
1 lines of code changed in 1 file:
basic state is r8188
1 lines of code changed in 1 file:
return to base state r8187
5 lines of code changed in 2 files:
run P0H: Full predictive, no attention restriction, high predation, fitness fixed
- applied patch r8184 (hg96) and 8186
3 lines of code changed in 2 files:
run G0H: GOS-linked, no attention restriction, high predation, large N=10000, fitness fixed
- applied patch r8184 (hg96) and 8186
3 lines of code changed in 2 files:
run G1H: GOS-linked, full attention, high predation, large N 10000, fitness fixed
- applied patch r8184 (hg96) and 8186
3 lines of code changed in 2 files:
run P1H: Full predictive, full attention, high predation, large N 10000, fitness fixed
- applied patch r8184 (hg96) and 8186
1 lines of code changed in 1 file:
run P1H: Full predictive, full attention, high predation, large N 10000 (fitness fixed)
1 lines of code changed in 1 file:
even better fix for fitness overflow, r8183
2 lines of code changed in 1 file:
enable background compression
1 lines of code changed in 1 file:
better avoid fitness overflow, patch `hg96`
1 lines of code changed in 1 file:
check for fitness overflow, patch `hg95`
1 lines of code changed in 1 file:
disable background compression of output files
{{{
# HG changeset patch
# User Sergey Budaev <sergey.budaev@uib.no>
# Date 1556445013 -7200
# Sun Apr 28 11:50:13 2019 +0200
# Node ID 90a5a9ce1ec8fc47a0d4b1c127157d9657668fde
# Parent 5ced71f00bdc9a450e9bd45e6f830defa878166f
disable background compression of ooutput files
diff -r 5ced71f00bdc -r 90a5a9ce1ec8 m_common.f90
--- a/m_common.f90 Sat Apr 27 11:27:13 2019 +0000
+++ b/m_common.f90 Sun Apr 28 11:50:13 2019 +0200
@@ -2016,7 +2016,7 @@
!> This parameter defines if the output files are compressed in the
!! background in the parallel mode or the program should wait for
!! termination of the child zipping process.
- logical, parameter, public :: ZIP_OUTPUTS_BACKGROUND=.TRUE.
+ logical, parameter, public :: ZIP_OUTPUTS_BACKGROUND=.FALSE.
!> This parameter defines the compression program that is executed to "zip"
!! the data files if commondata::is_zip_outputs is enabled (TRUE).
}}}
1 lines of code changed in 1 file:
back to standard model r8177 (**P1H**)
- `svn merge -r HEAD:8177 .`
5 lines of code changed in 2 files:
run P0H: Full predictive, no attention restriction, high predation
3 lines of code changed in 2 files:
run G0H: GOS-linked, no attention restriction, high predation, large N=10000
3 lines of code changed in 2 files:
run G1H: GOS-linked, full attention, high predation, large N 10000
3 lines of code changed in 2 files:
run P1H: Full predictive, full attention, high predation, large N 10000
5 lines of code changed in 1 file:
Work in progress
24 lines of code changed in 1 file:
Work in progress
110 lines of code changed in 1 file:
Added a
function for importing experiment data.
23 lines of code changed in 1 file:
Fixed bug that caused negative survival if starvation limit was turned on.
2 lines of code changed in 2 files:
Fixed bug
2 lines of code changed in 2 files:
Fixed bug that caused negative survival if starvation limit was turned on.
4 lines of code changed in 2 files:
Minor updated to plots.
6 lines of code changed in 1 file:
run: fully predictive behaviour
1 lines of code changed in 1 file:
run: small popsize 1000
1 lines of code changed in 1 file:
run: fixed from GOS, fixed steps 448
3 lines of code changed in 1 file:
Minor change to axis title.
1 lines of code changed in 1 file:
Minor changes to axis titles.
2 lines of code changed in 1 file:
typo fixed
1 lines of code changed in 1 file:
added inline test for strings
3 lines of code changed in 1 file:
completed tests for strings module
63 lines of code changed in 1 file:
more tests for strings module
53 lines of code changed in 1 file:
Minor change
2 lines of code changed in 1 file:
Changed environmental values to fit the new ValueOfE scale.
2 lines of code changed in 1 file:
Fixed error in makefile
31 lines of code changed in 2 files:
Added propset to the file
2 lines of code changed in 1 file:
Version of the model to run experiments by forcing indivduals through preset environmens.
699 lines of code changed in 1 file:
Updated to reflect changes in the other versions of the model
23 lines of code changed in 1 file:
Removed all -f as they caused problems for windows.
2 lines of code changed in 1 file:
Updated makefile to also be able to compile Hormones_v2_forced.f90, just write make ex.
22 lines of code changed in 1 file:
Added proset to file
2 lines of code changed in 1 file:
Version of the model for doing experiments and forcing individuals through choosen environments.
675 lines of code changed in 1 file:
FEE v.3.6.8, incorporated comments to reviewers (responses) in FEE review forum to the manuscript
- some words deleted throughout the paper to keep within 12000 limit
97 lines of code changed in 2 files:
Changed file locations, fixed some errors and changed VE.limits
29 lines of code changed in 1 file:
Minor change
29 lines of code changed in 1 file:
added male fertility in exponential relationship to resources
65 lines of code changed in 1 file:
Changes to locations for files and some updates to plots.
21 lines of code changed in 1 file:
Minor change
2 lines of code changed in 1 file:
more tests for strings
62 lines of code changed in 1 file:
test parse
0 lines of code changed in 2 files:
tool: show all procs
2 lines of code changed in 1 file:
Fixed error where initial R_cat was saved incorrecly to the ind.array.
5 lines of code changed in 1 file:
Minor but important fix
1 lines of code changed in 1 file:
Fixed error where initial R_cat was saved incorrecly to the ind.array.
5 lines of code changed in 1 file:
Fixed error where initial R_cat was saved incorrecly to the ind.array.
5 lines of code changed in 1 file:
Updated R_categories_init.
1 lines of code changed in 1 file:
Updated how R_cat and reserves are saved to the ind-matrix.
2 lines of code changed in 1 file:
Added Figure F which is just showing our theory regarding parasite manipulation.
84 lines of code changed in 1 file:
Updated to new parameters.
2 lines of code changed in 1 file:
Uncommented starvation limit in code, remember to set the starvation parameter to -1000 to not have it in use.
4 lines of code changed in 1 file:
Updated to new parameters.
17 lines of code changed in 1 file:
Updated to new parameters.
0 lines of code changed in 2 files:
Updated to new parameterset.
25 lines of code changed in 1 file:
Updated to new parameterset.
9 lines of code changed in 1 file:
(population_load_data_all_genomes): implemented procedure to load genome data
- merged after further testing r8121 from 06
- merged from feature branch as in r8119
1930 lines of code changed in 6 files:
development branch deleted
- HEDG2_06-read-genome branch for (population_load_data_all_genomes)
0 lines of code changed in 2 files:
(population_load_data_all_genomes): implemented procedure to load genome data
- merged from feature branch as in r8119
386 lines of code changed in 1 file:
delete debug code
0 lines of code changed in 1 file:
(population_load_data_all_genomes): debugging, small fixes, error checking short lines
40 lines of code changed in 2 files:
(population_load_data_all_genomes): debugging, other files, abridged subdata auto-initialised random
14 lines of code changed in 2 files:
(population_load_data_all_genomes): debugging
53 lines of code changed in 2 files:
(population_load_data_all_genomes): debugging
62 lines of code changed in 2 files:
(population_load_data_all_genomes): debugging
26 lines of code changed in 3 files:
(population_load_data_all_genomes): public interface
3 lines of code changed in 1 file:
(population_load_data_all_genomes): continue implementing
21 lines of code changed in 1 file:
(population_load_data_all_genomes): continue implementing
0 lines of code changed in 2 files:
run: GOS-linked behaviour selection
1 lines of code changed in 1 file:
run: big population 10000, reproduction threshold reduced 1.0
2 lines of code changed in 1 file:
separate feature branch for genome read procedure, return main to r8090
- HEDG2_06-read-genome - new feature branch for genome
read (population_load_data_all_genomes)
- `svn merge -r HEAD:8090 .`
0 lines of code changed in 1 file:
adapted makefiles for tests within main hedtools
9 lines of code changed in 2 files:
move hedtools tests to main branch
620 lines of code changed in 3 files:
hedtools tests more visual
10 lines of code changed in 2 files:
- Changed order of plots in Figure A
- Added points to the line for Figure B c) and d) to make them easier to distinguish from the line for virulence level 0.5 when they are printed in greyscale
- Removed reserves from Figure C as it could be difficult understand
16 lines of code changed in 1 file:
changed parameters and inserted the function to export my data to R to make graphs
61 lines of code changed in 1 file:
FEE v.3.6.7, adapt comments after r2 (r8069)
- r1
- r2
221 lines of code changed in 2 files:
(population_load_data_all_genomes): started implementing procedure to load genome data
code builds but incomplete
197 lines of code changed in 1 file:
returned to normal predictive as in r8090
`svn merge -r HEAD:8090 .`
3 lines of code changed in 1 file:
added sensible message based on error code from microsoft docs
12 lines of code changed in 1 file:
run: disabled attention restriction, predictive full
1 lines of code changed in 1 file:
Updated with current parameters.f90
0 lines of code changed in 2 files:
Updated with new parameters
0 lines of code changed in 2 files:
Changed M_O2 equation from being exponential to linear
0 lines of code changed in 2 files:
returned to predictive as in r8090
`svn merge -r HEAD:8090 .`
4 lines of code changed in 2 files:
Minor changes
37 lines of code changed in 1 file:
run: disable attention weighting
2 lines of code changed in 1 file:
GOS-linked behaviour
1 lines of code changed in 1 file:
return to high food as in r7884
2 lines of code changed in 1 file:
exclude pattern temporary files
1 lines of code changed in 1 file:
use environ vars for paths
Note that Windows doesn't normally allow joining vars
e.g. `%FPATH%%LOGFIL%`, use full path in both vars
5 lines of code changed in 1 file:
save log operation into log file
4 lines of code changed in 1 file: