-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13 from DEIS-Tools/inconsistent_lookup
Inconsistent lookup
- Loading branch information
Showing
8 changed files
with
539 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
|
|
||
| find_package (Boost COMPONENTS unit_test_framework REQUIRED) | ||
| include_directories (${TEST_SOURCE_DIR}/src | ||
| ${Boost_INCLUDE_DIRS} | ||
| ${libstrategy_SOURCE_DIR} | ||
| ) | ||
| add_definitions (-DBOOST_TEST_DYN_LINK) | ||
|
|
||
| add_executable (unordered_load unordered_load.cpp) | ||
| add_executable (inconsistent_lookup inconsistent_lookup.cpp) | ||
|
|
||
| target_link_libraries(unordered_load ${Boost_LIBRARIES} strategy) | ||
| target_link_libraries(inconsistent_lookup ${Boost_LIBRARIES} strategy) | ||
|
|
||
| add_test(NAME unordered_load COMMAND unordered_load) | ||
| add_test(NAME inconsistent_lookup COMMAND inconsistent_lookup) | ||
| set_tests_properties(inconsistent_lookup PROPERTIES | ||
| ENVIRONMENT STRATEGY_DIR=${CMAKE_CURRENT_SOURCE_DIR}/strategies) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright (C) 2021 Peter G. Jensen <[email protected]> | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #define BOOST_TEST_MODULE UnorderedLoad | ||
|
|
||
| #include <boost/test/unit_test.hpp> | ||
| #include <fstream> | ||
|
|
||
| #include "SimpleTree.h" | ||
|
|
||
| BOOST_AUTO_TEST_CASE(DirectoryTest) | ||
| { | ||
| BOOST_REQUIRE(getenv("STRATEGY_DIR")); | ||
| } | ||
|
|
||
| BOOST_AUTO_TEST_CASE(Inconsistent1) | ||
| { | ||
| std::string strategy = getenv("STRATEGY_DIR"); | ||
| strategy += "/inconsistent1.strategy"; | ||
| std::ifstream in(strategy); | ||
| auto tree = SimpleTree::parse(in, false, false); | ||
| double vars[] = {10}; | ||
| auto act18 = tree.value(vars,nullptr, 0); | ||
| auto act19 = tree.value(vars,nullptr, 1); | ||
| BOOST_REQUIRE_LT(act18, act19); | ||
| } | ||
|
|
||
| BOOST_AUTO_TEST_CASE(Inconsistent1Simplify) | ||
| { | ||
| std::string strategy = getenv("STRATEGY_DIR"); | ||
| strategy += "/inconsistent1.strategy"; | ||
| std::ifstream in(strategy); | ||
| auto tree = SimpleTree::parse(in, true, false); | ||
| double vars[] = {10}; | ||
| BOOST_REQUIRE_LT(tree.value(vars,nullptr, 0), tree.value(vars,nullptr, 1)); | ||
| } | ||
|
|
||
| BOOST_AUTO_TEST_CASE(Inconsistent1SimplifySubsumption) | ||
| { | ||
| std::string strategy = getenv("STRATEGY_DIR"); | ||
| strategy += "/inconsistent1.strategy"; | ||
| std::ifstream in(strategy); | ||
| auto tree = SimpleTree::parse(in, true, true); | ||
| double vars[] = {10}; | ||
| BOOST_REQUIRE_LT(tree.value(vars,nullptr, 0), tree.value(vars,nullptr, 1)); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| {"version":1.0,"type":"state->regressor","representation":"map","actions":{ | ||
| "0":"movement0.P0->movement0.F0T1 { isReady(id, 0, 1), tau, t := 0, position[id] := -1, punish(id, 0, 1) }", | ||
| "1":"movement0.P0->movement0.F0T2 { isReady(id, 0, 2), tau, t := 0, position[id] := -1, punish(id, 0, 2) }" | ||
| },"statevars":[ | ||
| "taskExe1.location" | ||
| ],"pointvars":[ | ||
| ],"locationnames":{ | ||
| "movement0.location":{ | ||
| "0":"P0", | ||
| "1":"F0T1", | ||
| "2":"F0T2", | ||
| "3":"F0T3", | ||
| "4":"P1", | ||
| "5":"F1T2", | ||
| "6":"F1T3", | ||
| "7":"P2", | ||
| "8":"F2T1", | ||
| "9":"F2T3", | ||
| "10":"P3", | ||
| "11":"F3T1", | ||
| "12":"F3T2" | ||
| }, | ||
| "taskExe0.location":{ | ||
| "0":"Waiting", | ||
| "1":"T0", | ||
| "2":"T1", | ||
| "3":"T2", | ||
| "4":"T3" | ||
| }, | ||
| "movement1.location":{ | ||
| "0":"P0", | ||
| "1":"F0T1", | ||
| "2":"F0T2", | ||
| "3":"F0T3", | ||
| "4":"P1", | ||
| "5":"F1T2", | ||
| "6":"F1T3", | ||
| "7":"P2", | ||
| "8":"F2T1", | ||
| "9":"F2T3", | ||
| "10":"P3", | ||
| "11":"F3T1", | ||
| "12":"F3T2" | ||
| }, | ||
| "taskExe1.location":{ | ||
| "0":"Waiting", | ||
| "1":"T0", | ||
| "2":"T1", | ||
| "3":"T2", | ||
| "4":"T3" | ||
| }, | ||
| "movement2.location":{ | ||
| "0":"P0", | ||
| "1":"F0T1", | ||
| "2":"F0T2", | ||
| "3":"F0T3", | ||
| "4":"P1", | ||
| "5":"F1T2", | ||
| "6":"F1T3", | ||
| "7":"P2", | ||
| "8":"F2T1", | ||
| "9":"F2T3", | ||
| "10":"P3", | ||
| "11":"F3T1", | ||
| "12":"F3T2" | ||
| }, | ||
| "taskExe2.location":{ | ||
| "0":"Waiting", | ||
| "1":"T0", | ||
| "2":"T1", | ||
| "3":"T2", | ||
| "4":"T3" | ||
| } | ||
| },"regressors":{ | ||
| "(4)": | ||
| {"type":"act->point->val","representation":"simpletree","minimize":0,"regressor": | ||
| { | ||
| "0" : -58.52619021830245 | ||
| } | ||
| }, | ||
| "(2)": | ||
| {"type":"act->point->val","representation":"simpletree","minimize":0,"regressor": | ||
| { | ||
| "1" : -104.5393376817416 | ||
| } | ||
| }, | ||
| "(10)": | ||
| {"type":"act->point->val","representation":"simpletree","minimize":0,"regressor": | ||
| { | ||
| "0" : -39.75, | ||
| "1" : -26.30381528710121 | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.