Allow gigabytes in PRISM_JAVAMAXMEM, e.g. "2g".

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2429 bbc10eb1-c90d-0410-af57-cb519fbb1720

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?
+
 =======================================================
 =======================================================
 

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

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

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