Commit 0e9bc71f authored by Romain Reuillon's avatar Romain Reuillon
Browse files

Fix entries after syntax evolution

parent e6d7a0af
......@@ -31,11 +31,10 @@ val cmds = Seq("experiments:setup-experiment \"fixed\" ${population} ${wiggleAng
val ants =
NetLogo5Task(workDirectory / "model" / "HEADLESS_ants.nlogo", cmds, seed = seed,embedWorkspace=true) set (
// Map the OpenMOLE variables to NetLogo variables
inputs += (population,diffusionRate,evaporationRate,wiggleAngle,seed,id),
outputs += (population,diffusionRate,evaporationRate,wiggleAngle,seed,id),
netLogoOutputs += ("final-ticks-food1", food1),
netLogoOutputs += ("final-ticks-food2", food2),
netLogoOutputs += ("final-ticks-food3", food3)
(inputs, outputs) += (population, diffusionRate, evaporationRate, wiggleAngle, seed, id),
outputs += food1 mapped "final-ticks-food1",
outputs += food2 mapped "final-ticks-food2",
outputs += food3 mapped "final-ticks-food3"
)
......@@ -43,7 +42,7 @@ val ants =
Replication (
evaluation = (ants on env hook indics_hook),
seed = seed,
replications = 64
sample = 64
)
......
......@@ -34,10 +34,10 @@ val cmds = Seq("experiments:setup-experiment \"fixed\" ${population} ${wiggleAng
val ants =
NetLogo5Task(workDirectory / "model" / "HEADLESS_ants.nlogo", cmds, seed = seed,embedWorkspace=true) set (
// Map the OpenMOLE variables to NetLogo variables
inputs += (population,diffusionRate,evaporationRate,wiggleAngle,seed),
netLogoOutputs += ("final-ticks-food1", food1),
netLogoOutputs += ("final-ticks-food2", food2),
netLogoOutputs += ("final-ticks-food3", food3)
inputs += (population, diffusionRate, evaporationRate, wiggleAngle, seed),
outputs += food1 mapped "final-ticks-food1",
outputs += food2 mapped "final-ticks-food2",
outputs += food3 mapped "final-ticks-food3"
)
val analyse =
......@@ -49,8 +49,8 @@ val analyse =
""",
libraries = Seq("fitdistrplus")
) set (
rInputs += (diffusionRate, evaporationRate, food1.array, food2.array, food3.array),
rOutputs += ("distribs",distribs),
inputs += (diffusionRate.mapped, evaporationRate.mapped, food1.array.mapped, food2.array.mapped, food3.array.mapped),
outputs += distribs mapped "distribs",
resources += workDirectory / "fitdistr.R"
)
......@@ -60,7 +60,7 @@ val replications =
Replication (
evaluation = (ants on env) -- FilterTask(food1, food2, food3),
seed = seed,
replications = 64,
sample = 64,
aggregation = analyse hook indics_hook
)
......
......@@ -20,7 +20,7 @@ DirectSampling(
Replication(
evaluation = gama,
seed = seed,
replications = 10,
sample = 10,
aggregation = Seq(numberOfPreys aggregate average)) hook(workDirectory / "result.csv"),
sampling = nbPreysInit in (0 to 200 by 50)
)
......@@ -27,7 +27,7 @@ val exploration =
Replication(
evaluation = model on env hook display,
seed = seed,
replications = 100,
sample = 100,
aggregation = Seq(pi aggregate average)
) hook display
......
......@@ -21,7 +21,7 @@ val model = ScalaTask("""val y1 = x1 + 0.5 * x2;
SensitivitySaltelli(
evaluation = model,
samples = 100,
sample = 100,
inputs = Seq(x1 in (0.0, 1.0), x2 in (0.0, 1.0)),
outputs = Seq(y1, y2)
) hook display
......
......@@ -4,7 +4,7 @@ val replications =
Replication (
evaluation = ants,
seed = seed,
replications = 10,
sample = 10,
aggregation = Seq(food1 aggregate median, food3 aggregate median)
)
......
......@@ -3,7 +3,7 @@ import _parent_.Model._
Replication (
evaluation = ants,
seed = seed,
replications = 10,
sample = 10,
aggregation = Seq(food1 aggregate median, food3 aggregate median)
) hook display
......@@ -4,5 +4,5 @@ import _parent_.Model._
Replication (
evaluation = ants,
seed = seed,
replications = 10
sample = 10
) hook display
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