Skip to content

Commit

Permalink
Finished conversion of .bat launchers, removed test scripts, removed …
Browse files Browse the repository at this point in the history
…unnecessary title files, simplified scenario launcher config files
  • Loading branch information
lmgeorge committed Nov 16, 2019
1 parent 3ba0466 commit 9ffe35c
Show file tree
Hide file tree
Showing 334 changed files with 1,319 additions and 1,412 deletions.
5 changes: 0 additions & 5 deletions .scenario

This file was deleted.

11 changes: 2 additions & 9 deletions Scenarios/Generic/DensityScaling/.scenario
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"plotAllCharts": {
"script": "plotAllCharts.py",
"title": "Density Scaling",
"report": "output/InsetChart.json"
},
"plotSIRChannels": {
"commandline": "python ../../../bin/plotSIRChannels.py -c I -t \"Density Scaling\" output/InsetChart.json",
"script": "plotSIRChannels.py"
}
"plotAllCharts": "--title=\"Density Scaling\" output/InsetChart.json",
"plotSIRChannels": "-c I -t \"Density Scaling\" output/InsetChart.json"
}
11 changes: 5 additions & 6 deletions Scenarios/Generic/DensityScaling/plotAllCharts.ps1
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../scripts/helpers.ps1
. ../../../../scripts/helpers.ps1

$sc = (Get-Content -Path ".scenario" | ConvertFrom-Json -AsHashtable)
$key = (Split-Path $MyInvocation.MyCommand.Name -LeafBase)
$config = $sc[$key]
$pyscript = (Join-Path "$BIN_ROOT" $config.script)
& python $pyscript --title="$($config.title)" $config.report
Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script --title="Density Scaling" output/InsetChart.json
4 changes: 0 additions & 4 deletions Scenarios/Generic/DensityScaling/plotSIRChannels.bat

This file was deleted.

8 changes: 8 additions & 0 deletions Scenarios/Generic/DensityScaling/plotSIRChannels.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script -c I -t "Density Scaling" output/InsetChart.json
9 changes: 7 additions & 2 deletions Scenarios/Generic/DensityScaling/runEmod.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Push-Location -Path $PSScriptRoot
& ../../../bin/Eradication -C config.json -I ../../../Demographics_Files -D ../../../dll -O output
Push-Location -Path $PSScriptRoot

. ../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot

& $EMOD --config="config.json" --input-path="$INPUT_ROOT" --dll-path="$DLL_ROOT" --output-path="output"
Pop-Location
1 change: 0 additions & 1 deletion Scenarios/Generic/DensityScaling/title.txt

This file was deleted.

11 changes: 2 additions & 9 deletions Scenarios/Generic/HINT_AgeAndAccess/A_BaselineOutbreak/.scenario
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"plotPropertyReport": {
"commandline": "python ../../../../bin/plotPropertyReport.py output/PropertyReport.json",
"script": "plotPropertyReport.py"
},
"plotAllCharts": {
"script": "plotAllCharts.py",
"title": "HINT - Baseline Outbreak",
"report": "output/InsetChart.json"
}
"plotAllCharts": "--title=\"HINT - Baseline Outbreak\" output/InsetChart.json",
"plotPropertyReport": "output/PropertyReport.json"
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1
. ../../../../../scripts/helpers.ps1

$sc = (Get-Content -Path ".scenario" | ConvertFrom-Json -AsHashtable)
$key = (Split-Path $MyInvocation.MyCommand.Name -LeafBase)
$config = $sc[$key]
$pyscript = (Join-Path "$BIN_ROOT" $config.script)
& python $pyscript --title="$($config.title)" $config.report
Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script --title="HINT - Baseline Outbreak" output/InsetChart.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script output/PropertyReport.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Push-Location -Path $PSScriptRoot
& ../../../../bin/Eradication -C config.json -I ../../../../Demographics_Files -D ../../../../dll -O output
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot

& $EMOD --config="config.json" --input-path="$INPUT_ROOT" --dll-path="$DLL_ROOT" --output-path="output"
Pop-Location

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"plotPropertyReport": {
"commandline": "python ../../../../bin/plotPropertyReport.py output/PropertyReport.json",
"script": "plotPropertyReport.py"
},
"plotAllCharts": {
"script": "plotAllCharts.py",
"title": "HINT - Age-Targeted Vaccine",
"report": "output/InsetChart.json"
}
"plotAllCharts": "--title=\"HINT - Age-Targeted Vaccine\" output/InsetChart.json",
"plotPropertyReport": "output/PropertyReport.json"
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1
. ../../../../../scripts/helpers.ps1

$sc = (Get-Content -Path ".scenario" | ConvertFrom-Json -AsHashtable)
$key = (Split-Path $MyInvocation.MyCommand.Name -LeafBase)
$config = $sc[$key]
$pyscript = (Join-Path "$BIN_ROOT" $config.script)
& python $pyscript --title="$($config.title)" $config.report
Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script --title="HINT - Age-Targeted Vaccine" output/InsetChart.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script output/PropertyReport.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Push-Location -Path $PSScriptRoot
& ../../../../bin/Eradication -C config.json -I ../../../../Demographics_Files -D ../../../../dll -O output
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot

& $EMOD --config="config.json" --input-path="$INPUT_ROOT" --dll-path="$DLL_ROOT" --output-path="output"
Pop-Location

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"plotPropertyReport": {
"commandline": "python ../../../../bin/plotPropertyReport.py output/PropertyReport.json",
"script": "plotPropertyReport.py"
},
"plotAllCharts": {
"script": "plotAllCharts.py",
"title": "HINT - Access-Targeted Vaccine",
"report": "output/InsetChart.json"
}
"plotAllCharts": "--title=\"HINT - Access-Targeted Vaccine\" output/InsetChart.json",
"plotPropertyReport": "output/PropertyReport.json"
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1
. ../../../../../scripts/helpers.ps1

$sc = (Get-Content -Path ".scenario" | ConvertFrom-Json -AsHashtable)
$key = (Split-Path $MyInvocation.MyCommand.Name -LeafBase)
$config = $sc[$key]
$pyscript = (Join-Path "$BIN_ROOT" $config.script)
& python $pyscript --title="$($config.title)" $config.report
Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script --title="HINT - Access-Targeted Vaccine" output/InsetChart.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script output/PropertyReport.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Push-Location -Path $PSScriptRoot
& ../../../../bin/Eradication -C config.json -I ../../../../Demographics_Files -D ../../../../dll -O output
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot

& $EMOD --config="config.json" --input-path="$INPUT_ROOT" --dll-path="$DLL_ROOT" --output-path="output"
Pop-Location

This file was deleted.

11 changes: 2 additions & 9 deletions Scenarios/Generic/HINT_SeattleCommuting/.scenario
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"plotPropertyReport": {
"commandline": "python ../../../bin/plotPropertyReport.py output/PropertyReport.json -m",
"script": "plotPropertyReport.py"
},
"plotAllCharts": {
"script": "plotAllCharts.py",
"title": "HINT Seattle Commuting",
"report": "output/InsetChart.json"
}
"plotAllCharts": "--title=\"HINT Seattle Commuting\" output/InsetChart.json",
"plotPropertyReport": "output/PropertyReport.json -m"
}
11 changes: 5 additions & 6 deletions Scenarios/Generic/HINT_SeattleCommuting/plotAllCharts.ps1
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../scripts/helpers.ps1
. ../../../../scripts/helpers.ps1

$sc = (Get-Content -Path ".scenario" | ConvertFrom-Json -AsHashtable)
$key = (Split-Path $MyInvocation.MyCommand.Name -LeafBase)
$config = $sc[$key]
$pyscript = (Join-Path "$BIN_ROOT" $config.script)
& python $pyscript --title="$($config.title)" $config.report
Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script --title="HINT Seattle Commuting" output/InsetChart.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script output/PropertyReport.json -m
9 changes: 7 additions & 2 deletions Scenarios/Generic/HINT_SeattleCommuting/runEmod.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Push-Location -Path $PSScriptRoot
& ../../../bin/Eradication -C config.json -I ../../../Demographics_Files -D ../../../dll -O output
Push-Location -Path $PSScriptRoot

. ../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot

& $EMOD --config="config.json" --input-path="$INPUT_ROOT" --dll-path="$DLL_ROOT" --output-path="output"
Pop-Location
1 change: 0 additions & 1 deletion Scenarios/Generic/HINT_SeattleCommuting/title.txt

This file was deleted.

11 changes: 2 additions & 9 deletions Scenarios/Generic/SEIR/.scenario
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"plotAllCharts": {
"script": "plotAllCharts.py",
"title": "Generic SEIR",
"report": "output/InsetChart.json"
},
"plotSIRChannels": {
"commandline": "python ../../../bin/plotSIRChannels.py -c SEIR -t \"Generic SEIR\" output/InsetChart.json",
"script": "plotSIRChannels.py"
}
"plotAllCharts": "--title=\"Generic SEIR\" output/InsetChart.json",
"plotSIRChannels": "-c SEIR -t \"Generic SEIR\" output/InsetChart.json"
}
11 changes: 5 additions & 6 deletions Scenarios/Generic/SEIR/plotAllCharts.ps1
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../scripts/helpers.ps1
. ../../../../scripts/helpers.ps1

$sc = (Get-Content -Path ".scenario" | ConvertFrom-Json -AsHashtable)
$key = (Split-Path $MyInvocation.MyCommand.Name -LeafBase)
$config = $sc[$key]
$pyscript = (Join-Path "$BIN_ROOT" $config.script)
& python $pyscript --title="$($config.title)" $config.report
Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script --title="Generic SEIR" output/InsetChart.json
4 changes: 0 additions & 4 deletions Scenarios/Generic/SEIR/plotSIRChannels.bat

This file was deleted.

8 changes: 8 additions & 0 deletions Scenarios/Generic/SEIR/plotSIRChannels.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script -c SEIR -t "Generic SEIR" output/InsetChart.json
9 changes: 7 additions & 2 deletions Scenarios/Generic/SEIR/runEmod.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Push-Location -Path $PSScriptRoot
& ../../../bin/Eradication -C config.json -I ../../../Demographics_Files -D ../../../dll -O output
Push-Location -Path $PSScriptRoot

. ../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot

& $EMOD --config="config.json" --input-path="$INPUT_ROOT" --dll-path="$DLL_ROOT" --output-path="output"
Pop-Location
1 change: 0 additions & 1 deletion Scenarios/Generic/SEIR/title.txt

This file was deleted.

11 changes: 2 additions & 9 deletions Scenarios/Generic/SEIRS/.scenario
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"plotAllCharts": {
"script": "plotAllCharts.py",
"title": "SEIRS",
"report": "output/InsetChart.json"
},
"plotSIRChannels": {
"commandline": "python ../../../bin/plotSIRChannels.py -c SEIRW -t \"SEIRS\" output/InsetChart.json",
"script": "plotSIRChannels.py"
}
"plotAllCharts": "--title=\"SEIRS\" output/InsetChart.json",
"plotSIRChannels": "-c SEIRW -t \"SEIRS\" output/InsetChart.json"
}
11 changes: 5 additions & 6 deletions Scenarios/Generic/SEIRS/plotAllCharts.ps1
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../scripts/helpers.ps1
. ../../../../scripts/helpers.ps1

$sc = (Get-Content -Path ".scenario" | ConvertFrom-Json -AsHashtable)
$key = (Split-Path $MyInvocation.MyCommand.Name -LeafBase)
$config = $sc[$key]
$pyscript = (Join-Path "$BIN_ROOT" $config.script)
& python $pyscript --title="$($config.title)" $config.report
Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script --title="SEIRS" output/InsetChart.json
4 changes: 0 additions & 4 deletions Scenarios/Generic/SEIRS/plotSIRChannels.bat

This file was deleted.

8 changes: 8 additions & 0 deletions Scenarios/Generic/SEIRS/plotSIRChannels.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Push-Location -Path $PSScriptRoot

. ../../../../scripts/helpers.ps1

Push-Location -Path $PSScriptRoot
$name = (PSScriptBaseName)
$script = $PLOT[$name]
& python $script -c SEIRW -t "SEIRS" output/InsetChart.json
Loading

0 comments on commit 9ffe35c

Please sign in to comment.