Emulation for static operations, attributes

Author: kevinlano

BasicExpression.java

@@ -16955,7 +16955,7 @@ public Expression simplify(final Vector vars)
   public Expression evaluate(
                 ModelSpecification sigma, ModelState beta)
   { if (umlkind == VARIABLE)
-    { String nme = getData(); 
+    { String nme = getData();
       Expression expr = beta.getVariableValue(nme); 
 
       if (expr != null) 
@@ -16974,6 +16974,14 @@ public Expression evaluate(
 
     if (umlkind == ATTRIBUTE && objectRef != null)
     { String nme = getData(); 
+
+      if (this.isStatic() && entity != null)
+      { String ename = entity.getName(); 
+        Expression expr = 
+             sigma.getStaticAttributeValue(ename, nme); 
+        return expr; 
+      } 
+
       Expression obj = objectRef.evaluate(sigma,beta);
 
       if (obj != null) 
@@ -16983,6 +16991,14 @@ public Expression evaluate(
     if (umlkind == ATTRIBUTE && objectRef == null)
     { // attribute of self
       String nme = getData(); 
+
+      if (this.isStatic() && entity != null)
+      { String ename = entity.getName(); 
+        Expression expr = 
+             sigma.getStaticAttributeValue(ename, nme); 
+        return expr; 
+      } 
+
       Expression obj = beta.getVariableValue("self");
 
       if (obj != null) 
@@ -16997,30 +17013,36 @@ public Expression evaluate(
       String op = this.getData(); 
       Vector actualPars = this.getParameters(); 
       int npars = actualPars.size(); 
+      
+      BehaviouralFeature bf = null; 
+      Expression selfobject = null; 
 
-      Expression selfobject; 
-
-      if (obj != null) 
-      { selfobject = obj.evaluate(sigma, beta); } 
+      if (this.isStatic() && entity != null)
+      { bf = entity.getOperation(op, npars); 
+        selfobject = new BasicExpression("null"); 
+      } 
       else 
-      { selfobject = beta.getVariableValue("self"); } 
+      { if (obj != null) 
+        { selfobject = obj.evaluate(sigma, beta); } 
+        else 
+        { selfobject = beta.getVariableValue("self"); } 
 
-      if (selfobject == null) // error
-      { return this; } 
+        if (selfobject == null) // error
+        { return this; } 
 
-      ObjectSpecification ospec = 
+        ObjectSpecification ospec = 
                  sigma.getObjectSpec("" + selfobject);
 
-      if (ospec == null) // error
-      { return this; }
+        if (ospec == null) // static case
+        { return this; } 
 
-      Entity ent = ospec.getEntity(); 
+        Entity ent = ospec.getEntity(); 
 
-      if (ent == null) 
-      { return this; } 
+        if (ent == null) 
+        { return this; } 
 
-      BehaviouralFeature bf = ent.getOperation(op, npars);
-      // assume not static:  
+        bf = ent.getOperation(op, npars);
+      }
 
       if (bf == null) 
       { return this; } 
@@ -17037,7 +17059,8 @@ public Expression evaluate(
       } 
 
       Expression res = 
-         bf.execute(sigma, opstackframe, parValues);  
+         bf.execute(sigma, opstackframe, parValues);
+  
       return res; 
     } 
 

Entity.java

@@ -5795,6 +5795,7 @@ public void emulateOperation(String op)
       ObjectSpecification obj = this.initialisedObject(oid); 
       ms.addObject(obj);
       beta.addVariable("self", new BasicExpression(obj));   
+                               // new BasicExpression(oid)
       System.out.println(">> Initial state = " + ms + "; " + beta); 
 
       bf.execute(ms, beta, pvals); 

ModelSpecification.java

@@ -24,6 +24,9 @@ public class ModelSpecification
                       // String -> ObjectSpecification 
   java.util.Map objectsOfClass = new java.util.HashMap(); 
                       // String -> Vector
+  java.util.Map staticAttributesOfClass = 
+                      new java.util.HashMap(); 
+                      // String -> Map(String, Expression)
 
   public static int maxSourcePath = 1; 
   public static int maxTargetPath = 1; 
@@ -41,10 +44,23 @@ public ObjectSpecification getObjectSpec(String nme)
   { return (ObjectSpecification) objectmap.get(nme); } 
 
   public void removeObject(Expression expr)
-  { objectmap.remove(expr + ""); } 
+  { this.removeObject(expr + ""); } 
 
   public void removeObject(String nme)
-  { objectmap.remove(nme); } 
+  { ObjectSpecification obj = 
+          (ObjectSpecification) objectmap.get(nme);
+    objectmap.remove(nme); 
+    if (obj != null)
+    { objects.remove(obj); 
+      Entity ent = obj.entity; 
+      if (ent != null) 
+      { String ename = ent.getName();  
+        Vector eobjs = (Vector) objectsOfClass.get(ename);
+        if (eobjs != null) 
+        { eobjs.remove(obj); }   
+      } 
+    } 
+  } 
 
   public void addObject(ObjectSpecification obj) 
   { if (objects.contains(obj)) { } 
@@ -64,6 +80,25 @@ public void addObject(ObjectSpecification obj)
     } 
   } 
 
+  public void setStaticAttributeValue(String cls, String att,
+                                      Expression val)
+  { java.util.Map cAtts = 
+            (java.util.Map) staticAttributesOfClass.get(cls);  
+    if (cAtts == null) 
+    { cAtts = new java.util.HashMap(); } 
+    cAtts.put(att, val); 
+    staticAttributesOfClass.put(cls, cAtts); 
+  } 
+
+  public Expression getStaticAttributeValue(String cls, 
+                                        String att)
+  { java.util.Map cAtts = 
+            (java.util.Map) staticAttributesOfClass.get(cls);  
+    if (cAtts == null) 
+    { return null; } 
+    return (Expression) cAtts.get(att); 
+  } 
+
   public Vector getClassNames(Vector objs)
   { Vector res = new Vector(); 
     for (int i = 0; i < objs.size(); i++) 
@@ -137,6 +172,8 @@ public String toString()
     { ObjectSpecification spec = (ObjectSpecification) objects.get(i); 
       res = res + spec.details() + "\n"; 
     } 
+
+    res = res + objectsOfClass + "\n"; 
 
     for (int j = 0; j < correspondence.elements.size(); j++)
     { Maplet mm = (Maplet) correspondence.elements.get(j); 

ModelState.java

@@ -123,7 +123,7 @@ else if (obj == null)
         } 
       }  
       else if (obj != null && 
-          indx == null)
+               indx == null)
       { // object attribute
         Expression oid = obj.evaluate(sigma, this); 
         ObjectSpecification ref = sigma.getObjectSpec("" + oid); 

Statement.java

@@ -5000,7 +5000,7 @@ public static InvocationStatement newInvocationStatement(
   } 
 
   public int execute(ModelSpecification sigma, 
-                      ModelState beta)
+                     ModelState beta)
   { int res = Statement.NORMAL; 
 
     if (callExp == null) 
@@ -5017,29 +5017,41 @@ public int execute(ModelSpecification sigma,
       Vector actualPars = cexpr.getParameters(); 
       int npars = actualPars.size(); 
 
-      Expression selfobject; 
+      Expression selfobject = null;
+      BehaviouralFeature bf = null;
+ 
+      JOptionPane.showInputDialog(callExp.isStatic() + " " + 
+                                  callExp.getEntity()); 
 
-      if (obj != null) 
-      { selfobject = obj.evaluate(sigma, beta); } 
+      if (callExp.isStatic() && callExp.getEntity() != null)
+      { selfobject = new BasicExpression("null");  
+        Entity ent = callExp.getEntity(); 
+        bf = ent.getOperation(op, npars); 
+      } 
       else 
-      { selfobject = beta.getVariableValue("self"); } 
+      { if (obj != null) 
+        { selfobject = obj.evaluate(sigma, beta); } 
+        else 
+        { selfobject = beta.getVariableValue("self"); } 
 
-      if (selfobject == null) // error
-      { return res; } 
+      // JOptionPane.showInputDialog(selfobject); 
+
+        if (selfobject == null) // error 
+        { return res; } 
 
-      ObjectSpecification ospec = 
+        ObjectSpecification ospec = 
                  sigma.getObjectSpec("" + selfobject);
 
-      if (ospec == null) // error
-      { return res; }
- 
-      Entity ent = ospec.getEntity(); 
+        if (ospec == null) 
+        { return res; }
 
-      if (ent == null) 
-      { return res; } 
+        Entity ent = ospec.getEntity(); 
 
-      BehaviouralFeature bf = ent.getOperation(op, npars);
-      // assume not static:  
+        if (ent == null) 
+        { return res; } 
+
+        bf = ent.getOperation(op, npars);
+      } 
 
       if (bf == null) 
       { return res; } 

UCDArea.java

@@ -3679,14 +3679,17 @@ public void simulatedExecution(Entity cls)
       String oid = Identifier.newIdentifier("oid_");  
       ObjectSpecification obj = cls.initialisedObject(oid); 
       ms.addObject(obj);
-      beta.addVariable("self", new BasicExpression(obj));   
-      System.out.println(">> Initial state = " + ms + "; " + beta); 
+      beta.addVariable("self", new BasicExpression(obj));
+                               // new BasicExpression(oid)   
+      System.out.println(">> Initial global state = " + ms); 
+      System.out.println(">> Initial local state = " + beta); 
 
       bf.execute(ms, beta, pvals); 
       System.out.println(); 
-      System.out.println(">> Resulting state = " + ms + "; " + beta); 
+      System.out.println(">> Resulting global state = " + ms); 
+      System.out.println(">> Resulting local state = " + beta); 
     } 
-  } 
+  } // update UCDOperations
 
   public void energyAnalysis()
   { java.util.Map clnes = new java.util.HashMap(); 

UnaryExpression.java

@@ -1901,6 +1901,24 @@ public Expression evaluate(ModelSpecification sigma,
   { // Special cases for !e and ?x in sandboxed memory 
     // space in sigma. 
 
+    if (operator.equals("->allInstances"))
+    { Type resulttype = new Type("Sequence",null); 
+      Type reselementType = argument.getElementType(); 
+      resulttype.setElementType(elementType);
+      SetExpression res = new SetExpression(true); 
+      res.type = resulttype;  
+      res.multiplicity = ModelElement.MANY;
+      res.modality = argument.modality;
+      Vector objs = sigma.getObjectsOf(argument + ""); 
+      for (int i = 0; i < objs.size(); i++) 
+      { ObjectSpecification obj = 
+              (ObjectSpecification) objs.get(i); 
+        res.addElement(new BasicExpression(obj)); 
+      } 
+ 
+      return res; 
+    }
+
     Expression pre = argument.evaluate(sigma, beta);
     return Expression.simplify(operator, pre); 
   } 
@@ -1912,17 +1930,34 @@ public void execute(ModelSpecification sigma,
       System.out.println("DISPLAY: " + val);  
     }  
     else if ("->isDeleted".equals(operator))
-    { if (argument.umlkind == CLASSID && 
-          (argument instanceof BasicExpression) && 
+    { if (argument instanceof BasicExpression && 
           ((BasicExpression) argument).arrayIndex == null) 
-      { // remove an object from its class
+      { // remove the object from its class, and set the 
+        // object variable to null: 
+
         Expression obj = argument.evaluate(sigma, beta);
         sigma.removeObject(obj); 
         beta.updateState(sigma, argument, 
                          new BasicExpression("null")); 
         System.out.println("DELETED: " + obj);  
       } 
     } 
+    else if ("->oclIsNew".equals(operator) && 
+             (argument instanceof BasicExpression))
+    { Type argt = argument.getType(); 
+      if (argt != null && argt.isEntity())
+      { Entity argent = argt.getEntity(); 
+        String ename = argent.getName(); 
+        Expression obj = argument.evaluate(sigma, beta);
+        if ("null".equals(obj + ""))
+        { String oid = Identifier.newIdentifier("oid_");  
+          ObjectSpecification newobj = 
+                 argent.initialisedObject(oid);
+          sigma.addObject(newobj); 
+          beta.updateState(sigma, argument, new BasicExpression(oid));  
+        } 
+      } 
+    }
   }  
 
   public String updateForm(java.util.Map env, boolean local)