From 3f119d5836d5f5469d8006121aaeb9a7b5981200 Mon Sep 17 00:00:00 2001 From: jjenista Date: Mon, 24 Aug 2009 16:50:27 +0000 Subject: [PATCH] regression updates --- Robust/src/Tests/mlp/regression/makefile | 4 ++-- Robust/src/Tests/mlp/regression/runTests | 17 +++++++++++++++-- Robust/src/Tests/mlp/regression/test.java | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Robust/src/Tests/mlp/regression/makefile b/Robust/src/Tests/mlp/regression/makefile index 22e19777..bd6aab69 100644 --- 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 31eb888e..49d67e31 100755 --- 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 ac7d9485..ee8cf6f1 100644 --- 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 ); } -- 2.34.1