regression updates

diff --git a/Robust/src/Tests/mlp/regression/makefile b/Robust/src/Tests/mlp/regression/makefile
index 22e19777b4201126ec6000d9e9769a3997a49796..bd6aab694d70a008898ac92da80579f20d8ec886 100644 (file)
--- a/Robust/src/Tests/mlp/regression/makefile
+++ b/Robust/src/Tests/mlp/regression/makefile
@@ -11,10 +11,10 @@ BSFLAGS= -nooptimize -debug -garbagestats -mainclass Test -ownership -ownallocde
 all: $(PROGRAM1).bin $(PROGRAM2).bin
 
 $(PROGRAM1).bin: $(SOURCE_FILES)
-       $(BUILDSCRIPT) $(USEMLP) $(BSFLAGS) -o $(PROGRAM1) $(SOURCE_FILES)
+       $(BUILDSCRIPT)           $(BSFLAGS) -o $(PROGRAM1) $(SOURCE_FILES)
 
 $(PROGRAM2).bin: $(SOURCE_FILES)
-       $(BUILDSCRIPT)           $(BSFLAGS) -o $(PROGRAM2) $(SOURCE_FILES)
+       $(BUILDSCRIPT) $(USEMLP) $(BSFLAGS) -o $(PROGRAM2) $(SOURCE_FILES)
 
 clean:
        rm -f  $(PROGRAM1).bin

diff --git a/Robust/src/Tests/mlp/regression/runTests b/Robust/src/Tests/mlp/regression/runTests
index 31eb888e7d536cb91a9539d2758ab4e580542fcb..49d67e311e5765d66077daa4656a90480317da5c 100755 (executable)
--- a/Robust/src/Tests/mlp/regression/runTests
+++ b/Robust/src/Tests/mlp/regression/runTests
@@ -1,3 +1,16 @@
-./testSingle.bin 1
+echo 'Each single/multi output line pairs should be identical'
 
-./testMulti.bin 1
+for i in $(seq 5)
+do
+
+echo ''
+./testSingle.bin 25
+./testMulti.bin  25
+echo ''
+./testSingle.bin 125
+./testMulti.bin  125
+echo ''
+./testSingle.bin 1255
+./testMulti.bin  1255
+
+done

diff --git a/Robust/src/Tests/mlp/regression/test.java b/Robust/src/Tests/mlp/regression/test.java
index ac7d9485a25740cd04bc1b02528b602155ac621c..ee8cf6f17e41d3d842550ed493d482c968343f05 100644 (file)
--- a/Robust/src/Tests/mlp/regression/test.java
+++ b/Robust/src/Tests/mlp/regression/test.java
@@ -23,6 +23,21 @@ public class Test {
        }
       }
 
+      if( i % 2 == 0 ) {
+       sese change {
+         for( int k = 0; k < i*2; ++k ) {
+           sum = sum + 1;          
+         }
+         sum = sum + 1;
+       }       
+
+       sese changeAgain {
+         for( int l = 0; l < 3; ++l ) {
+           sum = sum / 2;
+         }
+       }
+      }
+
       sese prnt {
        mightPrint( x, i, sum );
       }