Skip to content

fix: read maxtime and params from in1 in concore.hpp #621

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

Open
bhuvan-somisetty wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: read maxtime and params from in1 in concore.hpp #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions TestConcoreHpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,19 +240,19 @@ static void test_mapParser_missing_file_is_empty() {

static void test_default_maxtime_reads_file() {
setup_dirs();
write_file("in/1/concore.maxtime", "200");
write_file("in1/concore.maxtime", "200");

Concore c;
c.delay = 0;
c.default_maxtime(100);

check("default_maxtime from file==200", c.maxtime == 200);

rm("in/1/concore.maxtime");
rm("in1/concore.maxtime");
}

static void test_default_maxtime_fallback() {
rm("in/1/concore.maxtime");
rm("in1/concore.maxtime");

Concore c;
c.delay = 0;
Expand All @@ -265,7 +265,7 @@ static void test_default_maxtime_fallback() {

static void test_tryparam_found() {
setup_dirs();
write_file("in/1/concore.params", "{'alpha': '0.5', 'beta': '1.0'}");
write_file("in1/concore.params", "{'alpha': '0.5', 'beta': '1.0'}");

Concore c;
c.delay = 0;
Expand All @@ -274,11 +274,11 @@ static void test_tryparam_found() {
check("tryparam found alpha", c.tryparam("alpha", "0.0") == "0.5");
check("tryparam found beta", c.tryparam("beta", "0.0") == "1.0");

rm("in/1/concore.params");
rm("in1/concore.params");
}

static void test_tryparam_missing_key_uses_default() {
rm("in/1/concore.params");
rm("in1/concore.params");

Concore c;
c.delay = 0;
Expand All @@ -290,7 +290,7 @@ static void test_tryparam_missing_key_uses_default() {

static void test_load_params_semicolon_format() {
setup_dirs();
write_file("in/1/concore.params", "a=1;b=2");
write_file("in1/concore.params", "a=1;b=2");

Concore c;
c.delay = 0;
Expand All @@ -299,7 +299,7 @@ static void test_load_params_semicolon_format() {
check("load_params semicolon parses a", c.tryparam("a", "") == "1");
check("load_params semicolon parses b", c.tryparam("b", "") == "2");

rm("in/1/concore.params");
rm("in1/concore.params");
}

// ------------- main -------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions concore.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,14 +1104,14 @@ class Concore{
*/
void default_maxtime(int defaultValue){
maxtime = (int)concore_base::load_maxtime(
inpath + "/1/concore.maxtime", (double)defaultValue);
inpath + "1/concore.maxtime", (double)defaultValue);
}

/**
* @brief Loads simulation parameters from concore.params into the params map.
*/
void load_params(){
params = concore_base::load_params(inpath + "/1/concore.params");
params = concore_base::load_params(inpath + "1/concore.params");
}

/**
Expand Down
Loading