Fixing tests and polishing code

Author: lucaneg

lisa/lisa-analyses/imp-testcases/numeric/numeric.imp

@@ -1,17 +1,5 @@
 class tutorial {
 
-	constants(d) {
-		def c = 0;
-		def b = 1;
-		if (d > 10)
-	        c = -2;
-	    else
-		    c = 2;
-        b = b + c;
-        return b;
-    }
-
-/*
 	constants() {
 		def c = 1;
 		def b = 0;
@@ -121,6 +109,4 @@ class tutorial {
 		}
 		return x;
 	}
-	*/
-
 }

lisa/lisa-analyses/imp-testcases/stability/rectangleScale.imp

@@ -10,11 +10,8 @@ class Rectangle{
         this.botLeftX = 1;
         this.botLeftY = 1;
     }
-}
-
-class scaleBis{
-
-    scale(){
+    
+ 	main(){
         def r = new Rectangle();
         def scaleX = 2;
         def scaleY = -1;
@@ -31,6 +28,5 @@ class scaleBis{
         r.width = botRightX - r.botLeftX;
         r.height = topLeftY - r.botLeftY;
 
-    }
-
+    }   
 }

lisa/lisa-analyses/imp-testcases/stability/saneScale.imp

@@ -1,69 +1,24 @@
-
-// assume only positive values (negative values are for reflection)
-class scale{
-
-     main(b) {
-        def x = 10;
-        def y = 30;
-        def width = 3;
-        def height = 7;
-
-        while(b) {
-            x = x + 1;
-            y = y + 1;
-            width = width + 1;
-            height = height + 1;
-        }
-        while(b) {
-            x = x - 1;
-            y = y - 1;
-            width = width - 1;
-            height = height - 1;
-        }
-
-        this.scale(x, y, width, height);
-    }
-
-    //x, upperRightPointX and width should be covariant
-    //y, lowerLeftPointY and height should be covariant
-    //the two groups should be contravariant
+class stability {
     scale(x, y, width, height){
+    	//if (x >= 0 && y >= 0 && width > 0 && height > 0){
         if (x >= 0)
-         if (y >= 0)
-          if(width >= 0)
-           if (height >= 0){
-        //if (x >= 0 && y >= 0 && width > 0 && height > 0){
-            def scale1 = 2;
-            def scale2 = 3;
-
-            def upperRightPointX = x + width;
-
-            def lowerLeftPointY = y - height;
-
-            x = x * scale1;
-            y = y * scale2;
-            upperRightPointX = upperRightPointX * scale1;
-            lowerLeftPointY = lowerLeftPointY * scale2;
-
-            width = x - upperRightPointX;
-            height = y - lowerLeftPointY;
-        }
-    }
-/*
-    // all variables should be covariant
-    uniformScale(x, y, width, height, scale){
-            def upperRightPointX = x + width;
-
-            def lowerLeftPointY = y - height;
-
-            x = x * scale;
-            y = y * scale;
-            upperRightPointX = upperRightPointX * scale;
-            lowerLeftPointY = lowerLeftPointY * scale;
-
-            width = x - upperRightPointX;
-            height = y - lowerLeftPointY;
+        	if (y >= 0)
+          		if(width >= 0)
+           			if (height >= 0) {
+			            def scale1 = 2;
+			            def scale2 = 3;
+			
+			            def upperRightPointX = x + width;
+			
+			            def lowerLeftPointY = y - height;
+			
+			            x = x * scale1;
+			            y = y * scale2;
+			            upperRightPointX = upperRightPointX * scale1;
+			            lowerLeftPointY = lowerLeftPointY * scale2;
+			
+			            width = x - upperRightPointX;
+			            height = y - lowerLeftPointY;
+			        }
     }
-    */
-
 }