further program reductions

eclipse-agileuml · Feb 12, 2025 · 222857a · 222857a
1 parent 865651c
commit 222857a
Show file tree

Hide file tree

Showing 22 changed files with 85 additions and 0 deletions.
diff --git a/AssertStatement.class b/AssertStatement.class
diff --git a/AssignStatement.class b/AssignStatement.class
diff --git a/BasicExpression.class b/BasicExpression.class
diff --git a/BasicExpression.java b/BasicExpression.java
@@ -760,6 +760,21 @@ public static BasicExpression newStaticCallBasicExpression(
     return res; 
   } 
 
+  public static BasicExpression newStaticCallExpression(
+                      String cls, String op, Expression par) 
+  { Vector pars = new Vector(); 
+    pars.add(par); 
+    BasicExpression res = new BasicExpression(op);
+    BasicExpression obj = new BasicExpression(cls); 
+    obj.umlkind = CLASSID; 
+    res.setObjectRef(obj);  
+    res.umlkind = UPDATEOP;
+    res.isStatic = true; 
+    res.isEvent = true; 
+    res.parameters = pars; 
+    return res; 
+  } 
+
   public static BasicExpression newStaticCallBasicExpression(
                String f, Expression obj, Expression par) 
   { Vector pars = new Vector(); 

diff --git a/BreakStatement.class b/BreakStatement.class
diff --git a/CaseStatement.class b/CaseStatement.class
diff --git a/CatchStatement.class b/CatchStatement.class
diff --git a/ConditionalStatement.class b/ConditionalStatement.class
diff --git a/ContinueStatement.class b/ContinueStatement.class
diff --git a/CreationStatement.class b/CreationStatement.class
diff --git a/ErrorStatement.class b/ErrorStatement.class
diff --git a/FinalStatement.class b/FinalStatement.class
diff --git a/IfCase.class b/IfCase.class
diff --git a/IfStatement.class b/IfStatement.class
diff --git a/ImplicitInvocationStatement.class b/ImplicitInvocationStatement.class
diff --git a/InvocationStatement.class b/InvocationStatement.class
diff --git a/ReturnStatement.class b/ReturnStatement.class
diff --git a/SequenceStatement.class b/SequenceStatement.class
diff --git a/Statement.class b/Statement.class
diff --git a/Statement.java b/Statement.java
@@ -375,6 +375,7 @@ else if (st instanceof SequenceStatement)
 
       if (sq.size() == 2)
       { // patterns are I := I + 1; V := V + I
+        // I := I + 1; V := V - I
         // I := I + 1; V := V * I   var /= I
 
         Statement stat1 = sq.getStatement(0); 
@@ -554,6 +555,75 @@ else if ((lhs2 + " + 1").equals("" + rhs2) &&
 
             JOptionPane.showInputDialog(">> Code reduction of " + st + " to: " + ss);
 
+            return ss;    
+          } 
+          else if ((lhs1 + " + 1").equals("" + rhs1) && 
+              (lhs2 + " * " + lhs1).equals("" + rhs2))
+          { // I := I + 1; V := V * I
+            // reduces to V := V * MathLib.factorial(I + n)/
+            //                       MathLib.factorial(I); 
+            //            I := I + n
+
+            Expression rsize = 
+               Expression.simplifySize(rng);
+            Expression rsize1 = 
+                         new BinaryExpression("+", lhs1, rsize);
+            Expression fact1 = 
+              BasicExpression.newStaticCallExpression("MathLib",
+                                            "factorial", rsize1);
+            Expression fact2 = 
+              BasicExpression.newStaticCallExpression("MathLib",
+                                            "factorial", lhs1);
+
+            BinaryExpression idiv = 
+              new BinaryExpression("/", fact1, fact2);
+            AssignStatement asn1 = 
+              new AssignStatement(lhs2,
+                new BinaryExpression("*", lhs2, idiv));
+            AssignStatement asn2 = 
+              new AssignStatement(lhs1, 
+                new BinaryExpression("+", lhs1, rsize)); 
+            SequenceStatement ss = new SequenceStatement(); 
+            ss.addStatement(asn1); 
+            ss.addStatement(asn2);
+
+            JOptionPane.showInputDialog(">> Code reduction of " + st + " to: " + ss);
+
+            return ss;    
+          } 
+          else if ((lhs2 + " + 1").equals("" + rhs2) && 
+              (lhs1 + " * " + lhs2).equals("" + rhs1))
+          { // V := V * I ; I := I + 1
+            // reduces to V := V * (I+n-1)!/I!; 
+            //            I := I + n
+
+            Expression rsize = 
+               Expression.simplifySize(rng);
+            Expression rsize1 = 
+               new BinaryExpression("+", lhs2, 
+                    new BinaryExpression("-", rsize, 
+                           new BasicExpression(1)));
+            Expression fact1 = 
+              BasicExpression.newStaticCallExpression("MathLib",
+                                            "factorial", rsize1);
+            Expression fact2 = 
+              BasicExpression.newStaticCallExpression("MathLib",
+                                            "factorial", lhs2);
+
+            BinaryExpression idiv = 
+              new BinaryExpression("/", fact1, fact2);
+            AssignStatement asn1 = 
+              new AssignStatement(lhs1,
+                new BinaryExpression("*", lhs1, idiv));
+            AssignStatement asn2 = 
+              new AssignStatement(lhs2, 
+                new BinaryExpression("+", lhs2, rsize)); 
+            SequenceStatement ss = new SequenceStatement(); 
+            ss.addStatement(asn1); 
+            ss.addStatement(asn2);
+
+            JOptionPane.showInputDialog(">> Code reduction of " + st + " to: " + ss);
+
             return ss;    
           } 
         }

diff --git a/TryStatement.class b/TryStatement.class
diff --git a/WhileStatement.class b/WhileStatement.class