Commit f200e4ec authored by LIGNEUL CLEMENT's avatar LIGNEUL CLEMENT
Browse files

fix seed + island model

parent 4acfe27c
......@@ -12,8 +12,7 @@
"update-modules": "ncu -u && npm install"
},
"dependencies": {
"@nodegui/nodegui": "^0.31.0",
"nodeplotlib": "^0.7.3"
"@nodegui/nodegui": "^0.31.0"
},
"devDependencies": {
"@nodegui/packer": "^1.4.1",
......
......@@ -212,21 +212,21 @@ export class Run_tab {
if(this.island_model)
this.options = this.options.concat(' --remoteIslandModel 1');
// if first seed not set
if(isNaN(this.option_obj.seed)){
if(!isNaN(this.option_obj.proc_tab[i].seed_value)){
this.options = this.options.concat(' --seed ' + this.option_obj.proc_tab[i].seed_value.toString());
} else {
if(!isNaN(this.option_obj.proc_tab[i].seed_value)){
this.options = this.options.concat(' --seed ' + this.option_obj.proc_tab[i].seed_value);
} else {
if(isNaN(this.option_obj.seed)){
this.options = this.options.concat(' --seed ' + (timestamp_seed + seed_cpt));
seed_cpt += 1;
} else {
this.options = this.options.concat(' --seed ' + (this.option_obj.seed + seed_cpt));
}
} else {
this.options = this.options.concat(' --seed ' + (this.option_obj.seed + seed_cpt).toString());
seed_cpt += 1;
}
// island model options
if(island_btn.isChecked()){
if(activate_island_model.isChecked()){
console.log('island activation');
if(this.island_obj.ip_file){
this.options = this.options.concat(' --ipFile ' + this.island_obj.ip_file);
}
......@@ -235,6 +235,8 @@ export class Run_tab {
this.options = this.options.concat(' --migrationProbability ' + this.island_obj.migration_proba.toString());
}
console.log('migration = ' + this.island_obj.migration_proba);
if(this.island_obj.reevaluate){
this.options = this.options.concat(' --reevaluateImmigrants 1');
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment