summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjkinnebrew <jkinnebrew@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-02-22 19:36:00 +0000
committerjkinnebrew <jkinnebrew@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-02-22 19:36:00 +0000
commitbefc90a8d4453ccf7ff9bb7e4d65c880a3915e2f (patch)
tree1730ad26faed81bdc205304f4d5701afc93c2f9e
parente2df6a21b078b9d002c64d53f47b3beb68da892a (diff)
downloadATCD-befc90a8d4453ccf7ff9bb7e4d65c880a3915e2f.tar.gz
Mon Feb 22 19:34:32 UTC 2010 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu>
-rw-r--r--SA_POP/ChangeLog6
-rw-r--r--SA_POP/Standalone/SA_POP_Demo.cpp8
2 files changed, 13 insertions, 1 deletions
diff --git a/SA_POP/ChangeLog b/SA_POP/ChangeLog
index 995264e5e9c..f6035f8cbde 100644
--- a/SA_POP/ChangeLog
+++ b/SA_POP/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 22 19:34:32 UTC 2010 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu>
+
+ * Standalone/SA_POP_Demo.cpp:
+
+ Fixed missing UI default values.
+
Thu Jan 21 06:25:33 UTC 2010 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu>
* experiments/EU_Performance/Exp_Core/Exp_EU_Planner.h:
diff --git a/SA_POP/Standalone/SA_POP_Demo.cpp b/SA_POP/Standalone/SA_POP_Demo.cpp
index 8b4cb44fec1..5dd0eeba6dd 100644
--- a/SA_POP/Standalone/SA_POP_Demo.cpp
+++ b/SA_POP/Standalone/SA_POP_Demo.cpp
@@ -28,6 +28,12 @@ namespace SA_POP {
const SA_POP::CondID CondIDMax = 999999;
const SA_POP::Utility GoalUtilMin = -1000;
const SA_POP::Utility GoalUtilMax = 1000;
+ const SA_POP::Probability CondProbMin = 0.0;
+ const SA_POP::Probability CondProbMax = 1.0;
+ const size_t NumGoalsMin = 1;
+ const size_t NumGoalsMax = 10;
+ const size_t NumKnownCondsMin = 0;
+ const size_t NumKnownCondsMax = 100;
}; /* SA_POP::Default namespace */
}; /* SA_POP namespace */
@@ -147,7 +153,7 @@ int main (int argc, char* argv[])
//****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP****TEMP
// TO DO: CREATE QuestionRange template class to replace QuestionInt and use one with a type of double for condition probability.
- UserInterface::QuestionInt cond_prob_ques ("Initial condition probability (of true):", SA_POP::Default::CondProbMin, SA_POP::Default::CondProbMin);
+ UserInterface::QuestionInt cond_prob_ques ("Initial condition probability (of true):", SA_POP::Default::CondProbMin, SA_POP::Default::CondProbMax);
if (user_input.ask (cond_prob_ques))
cond_prob = cond_prob_ques.get_answer_int ();
else