Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Washington's updates to calibration 0.3 and 0.4 - part 1 #200

Merged
merged 11 commits into from
Dec 16, 2017
Merged

Washington's updates to calibration 0.3 and 0.4 - part 1 #200

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a6c23ed
Close #164 - Fix multiple runs to enable the model to read files in c…
wsenafranca Dec 6, 2017
90fddab
Close #172 - Remove MultipleRuns:output.
wsenafranca Dec 6, 2017
18f3b03
Fix to remove MultipleRuns:output for sample strategy.
wsenafranca Dec 6, 2017
fafdb8f
Close #48 - Redirect every print from models to log files in Multiple…
wsenafranca Dec 7, 2017
082407e
Close #189 - Add MultipleRuns:free to remove unnecessary memory
wsenafranca Dec 12, 2017
c80cf02
Review the message shown for output function error #172
wsenafranca Dec 13, 2017
674db42
Review the function to redirect output #48
wsenafranca Dec 13, 2017
6643053
Remove internal call to run model in randomModel #164
wsenafranca Dec 13, 2017
b6dd657
Remove freeModel function #164
wsenafranca Dec 13, 2017
7ee24fb
Close #159 - Remove graphics from multiLevel
wsenafranca Dec 13, 2017
eb72097
Remove skipRun from doc
wsenafranca Dec 13, 2017
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
95 changes: 83 additions & 12 deletions lua/MultipleRuns.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,24 @@ local function countSimulations(params, i)
return count
end

local function redirectPrint(f)
local log = ""
local oldPrint = print
print = function(...)
local str = ""
for _, v in ipairs({...}) do
str = str .. v .. "\t" -- SKIP
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not concatenate strings this way. It takes too much time. Use table.concat instead.

end

log = log .. str .. "\n" -- SKIP
end

f()

print = oldPrint
return log
end

-- function used in run() to test the model with all the possible combinations of parameters.
-- params: Table with all the parameters and it's ranges or values indexed by number.
-- Example: params = {{id = "x", min = 1, max = 10, elements = nil, ranged = true, step = 2},
Expand Down Expand Up @@ -326,7 +344,12 @@ local function factorialRecursive(data, params, a, variables, resultTable, addFu
local testDir = folderDir
firstDir:setCurrentDir()
local simulationTime = sessionInfo().time
local m = data.model(mVariables)
local logs = ""
local m
logs = logs..redirectPrint(function()
m = data.model(mVariables)
end)

testDir:setCurrentDir()
if data.folderName then
local dir = Directory(stringSimulations)
Expand All @@ -341,7 +364,10 @@ local function factorialRecursive(data, params, a, variables, resultTable, addFu
end

print(string.format("Running simulation %d/%d (%s)", numSimulation, maxSimulations, title)) -- SKIP
m:run() -- SKIP
logs = logs..redirectPrint(function()
m:run() -- SKIP
end)

simulationTime = round(sessionInfo().time - simulationTime) -- SKIP
print(string.format("Simulation finished in %s", timeToString(simulationTime))) -- SKIP
iterationTime = sessionInfo().time - iterationTime -- SKIP
Expand All @@ -357,9 +383,15 @@ local function factorialRecursive(data, params, a, variables, resultTable, addFu
local timeString = os.date("%H:%M", round(initialTime + estimatedTime))
print(string.format("Estimated time to finish all simulations: %s (%s)", timeString, timeToString(timeLeft))) -- SKIP
else
m:run()
logs = logs..redirectPrint(function()
m:run()
end)

end

local logfile = File("output.log")
logfile:writeLine(logs)
logfile:close()
clean()
testAddFunctions(resultTable, addFunctions, data, m, summaryResult)
testDir:setCurrentDir()
Expand Down Expand Up @@ -436,7 +468,12 @@ local function factorialRecursive(data, params, a, variables, resultTable, addFu
local testDir = folderDir
firstDir:setCurrentDir()
local simulationTime = sessionInfo().time
local m = data.model(mVariables)
local logs = ""
local m
logs = logs..redirectPrint(function()
m = data.model(mVariables)
end)

testDir:setCurrentDir()
if data.folderName then
local dir = Directory(stringSimulations)
Expand All @@ -451,7 +488,10 @@ local function factorialRecursive(data, params, a, variables, resultTable, addFu
end

print(string.format("Running simulation %d/%d (%s)", numSimulation, maxSimulations, title)) -- SKIP
m:run() -- SKIP
logs = logs..redirectPrint(function()
m:run() -- SKIP
end)

simulationTime = round(sessionInfo().time - simulationTime) -- SKIP
print(string.format("Simulation finished in %s", timeToString(simulationTime))) -- SKIP
iterationTime = sessionInfo().time - iterationTime -- SKIP
Expand All @@ -467,9 +507,14 @@ local function factorialRecursive(data, params, a, variables, resultTable, addFu
local timeString = os.date("%H:%M", round(initialTime + estimatedTime))
print(string.format("Estimated time to finish all simulations: %s (%s)", timeString, timeToString(timeLeft))) -- SKIP
else
m:run()
logs = logs..redirectPrint(function()
m:run()
end)
end

local logfile = File("output.log")
logfile:writeLine(logs)
logfile:close()
clean()
testAddFunctions(resultTable, addFunctions, data, m, summaryResult)
testDir:setCurrentDir()
Expand Down Expand Up @@ -806,7 +851,12 @@ function MultipleRuns(data)

local simulationTime = sessionInfo().time
firstDir:setCurrentDir()
local m = randomModel(data.model, data.parameters, true)
local logs = ""
local m
logs = logs..redirectPrint(function()
m = randomModel(data.model, data.parameters, true)
end)

if data.folderName then
folderDir:setCurrentDir()
local dir = Directory(stringSimulations..quantity)
Expand All @@ -821,7 +871,10 @@ function MultipleRuns(data)
end

print(string.format("Running simulation %d/%d (%s)", numSimulation, maxSimulations, title)) -- SKIP
m:run() -- SKIP
logs = logs..redirectPrint(function()
m:run() -- SKIP
end)

simulationTime = round(sessionInfo().time - simulationTime) -- SKIP
print(string.format("Simulation finished in %s", timeToString(simulationTime))) -- SKIP
iterationTime = sessionInfo().time - iterationTime -- SKIP
Expand All @@ -837,9 +890,14 @@ function MultipleRuns(data)
local timeString = os.date("%H:%M", round(initialTime + estimatedTime))
print(string.format("Estimated time to finish all simulations: %s (%s)", timeString, timeToString(timeLeft))) -- SKIP
else
m:run()
logs = logs..redirectPrint(function()
m:run()
end)
end

local logfile = File("output.log")
logfile:writeLine(logs)
logfile:close()
clean()
testAddFunctions(resultTable, addFunctions, data, m, summaryResult)
forEachOrderedElement(data.parameters, function(idx2, att2, typ2)
Expand Down Expand Up @@ -915,7 +973,12 @@ function MultipleRuns(data)
table.insert(resultTable.simulations, stringSimulations..idx)
local simulationTime = sessionInfo().time
firstDir:setCurrentDir()
local m = data.model(clone(att))
local logs = ""
local m
logs = logs..redirectPrint(function()
m = data.model(clone(att))
end)

if data.folderName then
folderDir:setCurrentDir()
local dir = Directory(stringSimulations..idx)
Expand All @@ -930,7 +993,10 @@ function MultipleRuns(data)
end

print(string.format("Running simulation %d/%d (%s)", numSimulation, maxSimulations, title)) -- SKIP
m:run() -- SKIP
logs = logs..redirectPrint(function()
m:run() -- SKIP
end)

simulationTime = round(sessionInfo().time - simulationTime) -- SKIP
print(string.format("Simulation finished in %s", timeToString(simulationTime))) -- SKIP
iterationTime = sessionInfo().time - iterationTime -- SKIP
Expand All @@ -946,9 +1012,14 @@ function MultipleRuns(data)
local timeString = os.date("%H:%M", round(initialTime + estimatedTime))
print(string.format("Estimated time to finish all simulations: %s (%s)", timeString, timeToString(timeLeft))) -- SKIP
else
m:run()
logs = logs..redirectPrint(function()
m:run()
end)
end

local logfile = File("output.log")
logfile:writeLine(logs)
logfile:close()
clean()
testAddFunctions(resultTable, addFunctions, data, m, summaryResult)
forEachOrderedElement(data.parameters[idx], function(idx2, att2)
Expand Down