diff --git a/prism/NOTES b/prism/NOTES index 0a56155c..2c8d32d4 100644 --- a/prism/NOTES +++ b/prism/NOTES @@ -119,6 +119,7 @@ PTAs: (then test on Arnd's BRP model + Marco's + others) Simulator: +* New display progress meter for simulation? * SimMethod deal with possibility of more iters than expected - recalc some stats on computeMissingParameterAfterSim? - max 100% for getProgress? @@ -131,6 +132,10 @@ Simulator: * make percentage from getProgress more accurate, do mod 10 after * do we stil need reset() in SimMethod? Don't delete, just check +General: +* finish -explicitbuild (e.g. no labels, rewards), currently in -qar +* postpone reward struct constr until needed? + ======================================================= ======================================================= diff --git a/prism/src/bin/prism.cygwin b/prism/src/bin/prism.cygwin index 9c0fb57c..cf3376c4 100644 --- a/prism/src/bin/prism.cygwin +++ b/prism/src/bin/prism.cygwin @@ -12,7 +12,7 @@ fi # Max memory for Java if [ "$PRISM_JAVAMAXMEM" != "" ]; then - PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[mk]?$/` + PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVAMAXMEM" = "" ]; then echo; echo "Error: Environment variable PRISM_JAVAMAXMEM is invalid."; exit fi diff --git a/prism/src/bin/prism.darwin b/prism/src/bin/prism.darwin index f0aac21e..30f3bef9 100755 --- a/prism/src/bin/prism.darwin +++ b/prism/src/bin/prism.darwin @@ -12,7 +12,7 @@ fi # Max memory for Java if [ "$PRISM_JAVAMAXMEM" != "" ]; then - PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[mk]?$/` + PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVAMAXMEM" = "" ]; then echo; echo "Error: Environment variable PRISM_JAVAMAXMEM is invalid."; exit fi diff --git a/prism/src/bin/prism.linux b/prism/src/bin/prism.linux index a9bf31b9..e5dd4867 100755 --- a/prism/src/bin/prism.linux +++ b/prism/src/bin/prism.linux @@ -12,7 +12,7 @@ fi # Max memory for Java if [ "$PRISM_JAVAMAXMEM" != "" ]; then - PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[mk]?$/` + PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/` if [ "$PRISM_JAVAMAXMEM" = "" ]; then echo; echo "Error: Environment variable PRISM_JAVAMAXMEM is invalid."; exit fi