diff --git a/src/data_files/files/spartan/sim_db.sql b/src/data_files/files/spartan/sim_db.sql index 3c46cc79e..793b67919 100644 --- a/src/data_files/files/spartan/sim_db.sql +++ b/src/data_files/files/spartan/sim_db.sql @@ -25,7 +25,12 @@ create table run( param7 text, param8 text, param9 text, - param10 text + param10 text, + param11 text, + param12 text, + param13 text, + param14 text, + param15 text ); /* @@ -69,7 +74,9 @@ select val3 begin_eid, ev_eid1 end_eid, cast (val5 as real) target, - cast(val6 as real) outcome + cast(val6 as real) outcome, + cast(val5 as real) / cast(val8 as numeric) target_edge, + cast(val8 as numeric) target_quantity from log where diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/db/SimDB.cpp b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/db/SimDB.cpp index 3b785ccb6..835518b82 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/db/SimDB.cpp +++ b/src/server/sparkd/cmds/spartan/md/mdp3/back_testing/db/SimDB.cpp @@ -101,7 +101,12 @@ SimDB::RunID SimDB::begin_run(SessionID sid, "param7," "param8," "param9," - "param10" + "param10," + "param11," + "param12," + "param13," + "param14," + "param15" ") values (" ":session_id," ":algo," @@ -124,7 +129,12 @@ SimDB::RunID SimDB::begin_run(SessionID sid, ":param7," ":param8," ":param9," - ":param10" + ":param10," + ":param11," + ":param12," + ":param13," + ":param14," + ":param15" ")"; SQLite::Statement statement(me->db, insert_run); @@ -152,7 +162,7 @@ SimDB::RunID SimDB::begin_run(SessionID sid, statement.bind(fmt::format(":param{}", p_idx++), fmt::format("{}: {}", name, val)); - for (auto i = p_idx; i <= 10; i++) + for (auto i = p_idx; i <= 15; i++) statement.bind(fmt::format(":param{}", i), ""); statement.exec();