Changeset 13456

Timestamp:

Sep 11, 2019 4:23:00 PM (3 months ago)

Author:

molsson

Message:

#5827 Merged revision(s) from branches/dev-mo-2267:

Location:

trunk

Files:

• . (modified) (1 prop)
• Compiler/ModelicaFlatTree/src/jastadd/FlatAPI/FlatAPI.jrag (modified) (2 diffs)
• Compiler/ModelicaFlatTree/src/jastadd/FlatUtil.jrag (modified) (2 diffs)
• Compiler/ModelicaFrontEnd/src/jastadd/flattening/Flattening.jrag (modified) (1 diff)
• Compiler/ModelicaFrontEnd/src/jastadd/flattening/FlatteningStatements.jrag (modified) (1 diff)
• Compiler/ModelicaFrontEnd/src/jastadd/flattening/connections/Connections.jrag (modified) (5 diffs)
• Compiler/ModelicaFrontEnd/src/java/org/jmodelica/common/ast/prefixes/CausalityConnectorPrefix.java (modified) (1 diff)
• Compiler/ModelicaFrontEnd/src/java/org/jmodelica/junit/TestTreeRunner.java (modified) (1 diff)
• Compiler/ModelicaFrontEnd/src/java/org/jmodelica/util/collections/ListUtil.java (modified) (2 diffs)
• Compiler/ModelicaFrontEnd/src/java/org/jmodelica/util/test/GenericTestTreeNode.java (modified) (1 diff)
• Compiler/ModelicaFrontEnd/src/java/org/jmodelica/util/test/TestTree.java (modified) (2 diffs)
• Compiler/ModelicaFrontEnd/test/modelica/ConnectTests.mo (modified) (15 diffs)
• Compiler/ModelicaFrontEnd/test/modelica/ExpandableConnectorArrays.mo (modified) (2 diffs)
• Compiler/ModelicaFrontEnd/test/modelica/ExpandableConnectors.mo (modified) (7 diffs)
• Compiler/ModelicaFrontEnd/test/modelica/NameTests.mo (modified) (1 diff)
• Compiler/ModelicaFrontEnd/test/modelica/OperatorRecordTests.mo (modified) (2 diffs)
• Compiler/ModelicaFrontEnd/test/modelica/OverconstrainedConnection.mo (modified) (1 diff)
• Compiler/ModelicaFrontEnd/test/modelica/RedeclareTests.mo (modified) (2 diffs)
• Compiler/ModelicaFrontEnd/test/modelica/StreamTests.mo (modified) (13 diffs)
• Compiler/ModelicaMiddleEnd/module.options (modified) (1 diff)
• Compiler/ModelicaMiddleEnd/src/jastadd/optimizations/AliasElimination.jrag (modified) (1 diff)
• Compiler/ModelicaMiddleEnd/test/modelica/CausalPorts.mo (copied) (copied from branches/dev-mo-2267/Compiler/ModelicaMiddleEnd/test/modelica/CausalPorts.mo)

trunk/Compiler/ModelicaFlatTree/src/jastadd/FlatAPI/FlatAPI.jrag

@@ -35 +35 @@
 import org.jmodelica.common.GUIDManager;
 import org.jmodelica.util.streams.StreamGobbler;
+import org.jmodelica.common.ast.prefixes.CausalityConnectorPrefix.CausalPortsEvaluator;
 
 aspect FlatAPI {
@@ -3163 +3164 @@
     
     syn boolean FAbstractVariable.isInput() = false;
-    eq FVariable.isInput() = getCausalityConnectorPrefix().inputCausality();
     syn boolean FAbstractVariable.isOutput() = false;
-    eq FVariable.isOutput() = getCausalityConnectorPrefix().outputCausality();
-      
+    eq FVariable.isInput()          = getCausalityConnectorPrefix().inputCausality (this);
+    eq FVariable.isOutput()         = getCausalityConnectorPrefix().outputCausality(this);
+    eq FFunctionVariable.isInput()  = getCausalityConnectorPrefix().inputCausality (this);
+    eq FFunctionVariable.isOutput() = getCausalityConnectorPrefix().outputCausality(this);
+    
+    ASTNode implements CausalPortsEvaluator;
+    syn boolean ASTNode.useCausalPorts() = myOptions().causal_ports.getValue();
 }
 

trunk/Compiler/ModelicaFlatTree/src/jastadd/FlatUtil.jrag

@@ -707 +707 @@
     }
     
+    
+    public abstract FAccess FAccess.copyAndAddSuffix(String suffix);
+    
+    public FAccessString FAccessEmpty.copyAndAddSuffix(String suffix) {
+        throw new UnsupportedOperationException();
+    }
+    
+    public FAccessString FAccessString.copyAndAddSuffix(String suffix) {
+        String name = getName();
+        String end = "";
+        if (name.endsWith("'")) {
+            name = name.substring(0, name.length() - 1);
+            end = "'";
+        }
+        return new FAccessString(name + suffix + end);
+    }
+    
+    public FAccessFull FAccessFull.copyAndAddSuffix(String suffix) {
+        FAccessFull res = fullCopy();
+        String name = res.getFAccessPart(0).getName();
+        String end = "";
+        if (name.endsWith("'")) {
+            name = name.substring(0, name.length() - 1);
+            end = "'";
+        }
+        res.getFAccessPart(0).setName(name + suffix + end);
+        return res;
+    }
+    
     /**
      * Create a copy of the name, with an FSubscript added to the last part.
@@ -1112 +1141 @@
     syn boolean FFunctionCall.isPartialFunctionCall() = false;
     eq FPartialFunctionCall.isPartialFunctionCall()   = true;
-     
-     syn boolean FFunctionVariable.isInput()  = getCausalityConnectorPrefix().inputCausality();
-     syn boolean FFunctionVariable.isOutput() = getCausalityConnectorPrefix().outputCausality();
      
      /**

trunk/Compiler/ModelicaFrontEnd/src/jastadd/flattening/Flattening.jrag

@@ -1238 +1238 @@
                 f.addFVariable(fv);
             }
+            if (fv.getCausalityConnectorPrefix().isStream() && useCausalPorts()) {
+                FVariable inStream = fv.treeCopy();
+                FAccess inStreamAccess = createInStreamAccess(inStream.getFAccess());
+                inStream.setFAccess(inStreamAccess);
+                inStream.setCausalityConnectorPrefix(CausalityConnectorPrefix.INSTREAM);
+                fv.annotation().vendorNode().forPath("internal/instream").setValue(new FStringLitExp(inStreamAccess.name()));
+                f.addFVariable(inStream);
+            }
             flattenMyType(f);
             clearModificationLevel(oldLevels);
         }
+    }
+    
+    inh FAccess InstAssignable.createInStreamAccess(FAccess streamAccess);
+    eq InstClassDecl.getChild().createInStreamAccess(FAccess streamAccess) {
+        FAccess result = streamAccess.copyAndAddSuffix("__instream_");
+        int i = 2;
+        while (componentExists(new QualifiedName(result.name()))) {
+            result = streamAccess.copyAndAddSuffix("__instream_" + i);
+            i++;
+        }
+        return result;
     }
     

trunk/Compiler/ModelicaFrontEnd/src/jastadd/flattening/FlatteningStatements.jrag

@@ -245 +245 @@
     eq Root.getChild().breakCondName() = null;
 
-    public boolean InstClassDecl.componentExists(String name) {
+    public boolean InstNode.componentExists(String name) {
         for (InstComponentDecl decl : allInstComponentDecls()) {
             if (decl.name().equals(name)) {
                 return true;
             }
+        }
+        return false;
+    }
+    
+    public boolean InstNode.componentExists(Iterator<String> qualifiedName) {
+        if (!qualifiedName.hasNext()) {
+            return true;
+        }
+        String name = qualifiedName.next();
+        if (componentExists(name)) {
+            return memberInstComponent(name).targetOrNull().componentExists(qualifiedName);
         }
         return false;

trunk/Compiler/ModelicaFrontEnd/src/jastadd/flattening/connections/Connections.jrag

@@ -82 +82 @@
     protected FExp FInStream.expandInStreamExp() {
         // Always create expression from the connection set where the variable is an inside connector. 
-        String name = getFExp().asCommonAccess().name();
-        ConnectionSet cs = myFClass().getConnectionSetManager().getStreamConnectionSet(name, false);
+        FAccess name = getFExp().asCommonAccess().asFAccess();
+        ConnectionSet cs = myFClass().getConnectionSetManager().getStreamConnectionSet(name.name(), false);
         return cs.expandInStreamExp(name);
     }
@@ -470 +470 @@
          * @param name  the name of the variable to generate name for
          */
-        public FExp expandInStreamExp(String name) {
+        public FExp expandInStreamExp(FAccess name) {
             throw new UnsupportedOperationException();
         }
@@ -537 +537 @@
         public void generateEquations(Flattener f) {
             ConnectionSetEntry fst = first();
-            if (size() == 1 && fst.isInside() && fst.getVar().isTopLevelCausalOrConnector()) {
+            InstComponentDecl fstVar = fst.getVar();
+            if (size() == 1 && fst.isInside() && fstVar.isTopLevelCausalOrConnector()
+                    && (fstVar.isInput() || fstVar.isOutput() || fstVar.useCausalPorts())) {
                 return;
             }
@@ -550 +552 @@
 
     public class StreamConnectionSet extends ConnectionSet {
+        
+        private static final String inStreamSuffix = "__instream_";
 
         private double nominal = Double.MAX_VALUE;
@@ -579 +583 @@
          * @param name  the name of the variable to generate name for
          */
-        public FExp expandInStreamExp(String name) {
+        @Override
+        public FExp expandInStreamExp(FAccess access) {
+            String name = access.name();
             ConnectionSetEntry e = getConnectionSetEntry(name, false);
-            FExp exp = expandInStreamExp(e, name, new FAccessExp(name));
+            if (access.useCausalPorts()) {
+                AnnotationNode instreamAnnotation = access.myFV().annotation().vendorNode().forPath("internal/instream");
+                if (instreamAnnotation.exists()) {
+                    String instreamName = instreamAnnotation.ceval().stringValue();
+                    access = nameWithSubscripts(instreamName, name);
+                }
+            }
+            FExp exp = expandInStreamExp(e, name, new FAccessExp(access));
             exp.enableStreamsRewrite();
             return exp;
         }
+        
+        public FAccess nameWithSubscripts(String name, String access) {
+            String subscripts = (access.endsWith("]")) ? access.substring(access.lastIndexOf("[")) : "";
+            return new FAccessString(name + subscripts);
+       }
 
         /**

trunk/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/common/ast/prefixes/CausalityConnectorPrefix.java

@@ -22 +22 @@
     }
     
-    public boolean inputCausality() {
-        return this == INPUT || this == FLOW || this == INSTREAM;
+    public boolean isStream() {
+        return this == STREAM;
     }
     
-    public boolean outputCausality() {
-        return this == OUTPUT || this == POTENTIAL || this == STREAM;
+    public interface CausalPortsEvaluator {
+        boolean useCausalPorts();
+    }
+    
+    /**
+     * We use a {@link CausalPortsEvaluator} here instead of an evaluated boolean
+     * to reduce the number of calls to useCausalPorts().
+     * Replace with a Predicate when updating to Java 8.
+     */
+    public boolean inputCausality(CausalPortsEvaluator evaluator) {
+        if (this == INPUT) {
+            return true;
+        }
+        if (this == FLOW || this == INSTREAM) {
+            return evaluator.useCausalPorts();
+        }
+        return false;
+    }
+    
+    public boolean outputCausality(CausalPortsEvaluator evaluator) {
+        if (this == OUTPUT) {
+            return true;
+        }
+        if (this == POTENTIAL || this == STREAM) {
+            return evaluator.useCausalPorts();
+        }
+        return false;
     }
     

trunk/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/junit/TestTreeRunner.java

@@ -100 +100 @@
             } 
             if (!(test instanceof TestTree)) {
-                String maybeSubTestName = test.getName();
+                String uniqueName = nc.makeUnique(testName);
+                test.setName(uniqueName);
                 // TODO: Upgrade JUnit version, then use createTestDescription(String, String) instead
-                String descStr = String.format("%s(%s)", nc.makeUnique(testName), packageName);
+                String descStr = String.format("%s(%s)", uniqueName, packageName);
                 chDesc = Description.createSuiteDescription(descStr);
-                caseDesc.put(maybeSubTestName, chDesc);
+                caseDesc.put(uniqueName, chDesc);
                 if(outputFailing) {
                     if(name.equals(testFile.getName())) { //Top-level test
-                        modelNames.put(maybeSubTestName, testName);
+                        modelNames.put(uniqueName, testName);
                     } else {
-                        modelNames.put(maybeSubTestName, String.format("%s.%s", name, testName));
+                        modelNames.put(uniqueName, String.format("%s.%s", name, testName));
                     }
                 }

trunk/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/util/collections/ListUtil.java

@@ -101 +101 @@
      */
     @SafeVarargs
-    public static <T> ArrayList<T> concatenate(List<T>... lists) {
+    public static <T> ArrayList<T> concatenate(List<? extends T>... lists) {
         return buildList(lists);
     }
@@ -112 +112 @@
      */
     @SafeVarargs
-    public static <T> ArrayList<T> buildList(Collection<T>... collections) {
+    public static <T> ArrayList<T> buildList(Collection<? extends T>... collections) {
         int size = 0;
-        for (Collection<T> list : collections) {
+        for (Collection<? extends T> list : collections) {
             size += list.size();
         }
         ArrayList<T> res = new ArrayList<T>(size);
-        for (Collection<T> list : collections) {
+        for (Collection<? extends T> list : collections) {
             res.addAll(list);
         }

trunk/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/util/test/GenericTestTreeNode.java

@@ -20 +20 @@
     public String getName();
 
+    public void setName(String name);
+
 }

trunk/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/util/test/TestTree.java

@@ -41 +41 @@
 
     public TestTree exit() {
-        if (children.isEmpty() && parent != null) 
+        if (children.isEmpty() && parent != null) {
             parent.children.remove(parentIndex);
+        }
         return parent;
     }
@@ -54 +55 @@
         return name;
     }
+    
+    @Override
+    public void setName(String name) {
+        this.name = name;
+    }
 
     public int numChildren() {

trunk/Compiler/ModelicaFrontEnd/test/modelica/ConnectTests.mo

@@ -316 +316 @@
  a1[2].x = a2[2].x;
  - a1[2].y - a2[2].y = 0.0;
+ a1[1].y = 0.0;
+ a1[2].y = 0.0;
+ a2[1].y = 0.0;
+ a2[2].y = 0.0;
 end ConnectTests.ConnectTest7;
 ")})));
@@ -352 +356 @@
  a[3].x = a[4].x;
  - a[1].y - a[2].y - a[3].y - a[4].y = 0.0;
+ a[1].y = 0.0;
+ a[2].y = 0.0;
+ a[3].y = 0.0;
+ a[4].y = 0.0;
 end ConnectTests.ConnectTest8;
 ")})));
@@ -380 +388 @@
  a[1].x = a[2].x;
  - a[1].y - a[2].y = 0.0;
+ a[1].y = 0.0;
+ a[2].y = 0.0;
 end ConnectTests.ConnectTest9;
 ")})));
@@ -454 +464 @@
  c1.b2.x = c2.b2.x;
  - c1.b2.y - c2.b2.y = 0.0;
+ c1.b1.y = 0.0;
+ c1.b2.y = 0.0;
+ c2.b1.y = 0.0;
+ c2.b2.y = 0.0;
 end ConnectTests.ConnectTest11;
 ")})));
@@ -549 +563 @@
  b[3,2].a[2].x = b[3,3].a[2].x;
  - b[1,1].a[1].y - b[1,1].a[2].y - b[1,2].a[1].y - b[1,2].a[2].y - b[1,3].a[1].y - b[1,3].a[2].y - b[1,4].a[1].y - b[2,1].a[1].y - b[2,1].a[2].y - b[2,2].a[1].y - b[2,2].a[2].y - b[2,3].a[1].y - b[2,3].a[2].y - b[2,4].a[1].y - b[3,1].a[2].y - b[3,2].a[2].y - b[3,3].a[2].y = 0.0;
+ b[1,1].a[1].y = 0.0;
+ b[1,1].a[2].y = 0.0;
+ b[1,2].a[1].y = 0.0;
+ b[1,2].a[2].y = 0.0;
+ b[1,3].a[1].y = 0.0;
+ b[1,3].a[2].y = 0.0;
+ b[1,4].a[1].y = 0.0;
+ b[1,4].a[2].y = 0.0;
+ b[2,1].a[1].y = 0.0;
+ b[2,1].a[2].y = 0.0;
+ b[2,2].a[1].y = 0.0;
+ b[2,2].a[2].y = 0.0;
+ b[2,3].a[1].y = 0.0;
+ b[2,3].a[2].y = 0.0;
+ b[2,4].a[1].y = 0.0;
+ b[2,4].a[2].y = 0.0;
+ b[3,1].a[1].y = 0.0;
+ b[3,1].a[2].y = 0.0;
+ b[3,2].a[1].y = 0.0;
+ b[3,2].a[2].y = 0.0;
+ b[3,3].a[1].y = 0.0;
+ b[3,3].a[2].y = 0.0;
+ b[3,4].a[1].y = 0.0;
+ b[3,4].a[2].y = 0.0;
 end ConnectTests.ConnectTest12;
 ")})));
@@ -595 +633 @@
  b[2].a[2].x = b[3].a[2].x;
  - b[1].a[2].y - b[2].a[2].y - b[3].a[2].y = 0.0;
+ b[1].a[1].y = 0.0;
+ b[1].a[2].y = 0.0;
+ b[2].a[1].y = 0.0;
+ b[2].a[2].y = 0.0;
+ b[3].a[1].y = 0.0;
+ b[3].a[2].y = 0.0;
 end ConnectTests.ConnectTest13;
 ")})));
@@ -670 +714 @@
  b1[2,2].a[2].x = b2[2,2].a[2].x;
  - b1[2,2].a[2].y - b2[2,2].a[2].y = 0.0;
+ b1[1,1].a[1].y = 0.0;
+ b1[1,1].a[2].y = 0.0;
+ b1[1,2].a[1].y = 0.0;
+ b1[1,2].a[2].y = 0.0;
+ b1[2,1].a[1].y = 0.0;
+ b1[2,1].a[2].y = 0.0;
+ b1[2,2].a[1].y = 0.0;
+ b1[2,2].a[2].y = 0.0;
+ b2[1,1].a[1].y = 0.0;
+ b2[1,1].a[2].y = 0.0;
+ b2[1,2].a[1].y = 0.0;
+ b2[1,2].a[2].y = 0.0;
+ b2[2,1].a[1].y = 0.0;
+ b2[2,1].a[2].y = 0.0;
+ b2[2,2].a[1].y = 0.0;
+ b2[2,2].a[2].y = 0.0;
 end ConnectTests.ConnectTest14;
 ")})));
@@ -744 +804 @@
  b[1,2,2].a[2].x = b[2,2,2].a[2].x;
  - b[1,2,2].a[2].y - b[2,2,2].a[2].y = 0.0;
+ b[1,1,1].a[1].y = 0.0;
+ b[1,1,1].a[2].y = 0.0;
+ b[1,1,2].a[1].y = 0.0;
+ b[1,1,2].a[2].y = 0.0;
+ b[1,2,1].a[1].y = 0.0;
+ b[1,2,1].a[2].y = 0.0;
+ b[1,2,2].a[1].y = 0.0;
+ b[1,2,2].a[2].y = 0.0;
+ b[2,1,1].a[1].y = 0.0;
+ b[2,1,1].a[2].y = 0.0;
+ b[2,1,2].a[1].y = 0.0;
+ b[2,1,2].a[2].y = 0.0;
+ b[2,2,1].a[1].y = 0.0;
+ b[2,2,1].a[2].y = 0.0;
+ b[2,2,2].a[1].y = 0.0;
+ b[2,2,2].a[2].y = 0.0;
 end ConnectTests.ConnectTest15;
 ")})));
@@ -1125 +1201 @@
  a1.b[2].x = a2.b[2].x;
  - a1.b[2].y - a2.b[2].y = 0.0;
+ a1.b[1].y = 0.0;
+ a1.b[2].y = 0.0;
+ a2.b[1].y = 0.0;
+ a2.b[2].y = 0.0;
 end ConnectTests.ConnectTest26;
 ")})));
@@ -1570 +1650 @@
  Real b.d.c2.y;
 equation
+ c1.y = 0.0;
  b.c2.x = c1.x;
  - b.c2.y - c1.y = 0.0;
@@ -2619 +2700 @@
     end for;
 
-    annotation(__JModelica(UnitTesting(tests={
-        TransformCanonicalTestCase(
-            name="StreamTest6",
-            description="Check that inStream() using out-of-bounds array access does not cause crash when used in inactive if branch",
-            flatModel="
+annotation(__JModelica(UnitTesting(tests={
+    TransformCanonicalTestCase(
+        name="StreamTest6",
+        description="Check that inStream() using out-of-bounds array access does not cause crash when used in inactive if branch",
+        eliminate_alias_variables=false,
+        variability_propagation=false,
+        flatModel="
 fclass ConnectTests.StreamTest6
  structural parameter Integer n = 2 /* 2 */;
@@ -2653 +2736 @@
  - a[2].b + b[2].a.b = 0.0;
  a[2].c = b[2].a.c;
+ a[1].b = 0.0;
+ a[2].b = 0.0;
 end ConnectTests.StreamTest6;
 ")})));
@@ -2714 +2799 @@
         name="Cardinality2",
         description="cardinality(): basic test",
+        eliminate_alias_variables=false,
+        variability_propagation=false,
         flatModel="
 fclass ConnectTests.Cardinality2
@@ -3154 +3241 @@
         name="TopLevelIO2",
         description="",
+        eliminate_alias_variables=false,
+        variability_propagation=false,
         flatModel="
 fclass ConnectTests.TopLevelIO2
@@ -3163 +3252 @@
  - c1.f + m.c2.f = 0.0;
  c1.x = m.c2.x;
+ c1.f = 0.0;
 end ConnectTests.TopLevelIO2;
 ")})));

trunk/Compiler/ModelicaFrontEnd/test/modelica/ExpandableConnectorArrays.mo

@@ -394 +394 @@
  flow Real c5.b;
 equation
+ c1.b = 0.0;
+ c2.b = 0.0;
+ c3.b = 0.0;
+ c4.b = 0.0;
+ c5.b = 0.0;
  c1.a = ec1[1].x.a;
  ec1[1].x.a = ec2[1].x.a;
@@ -652 +657 @@
  flow Real c[4].f;
 equation
+ c[1].f = 0.0;
+ c[2].f = 0.0;
+ c[3].f = 0.0;
+ c[4].f = 0.0;
  - c[1].f - c[3].f - ec1[1].a.f - ec2[1].a.f - ec3[1].a.f = 0.0;
  c[1].p = c[3].p;

trunk/Compiler/ModelicaFrontEnd/test/modelica/ExpandableConnectors.mo

@@ -105 +105 @@
  flow Real c5.b;
 equation
+ c1.b = 0.0;
+ c2.b = 0.0;
+ c3.b = 0.0;
+ c4.b = 0.0;
+ c5.b = 0.0;
  c1.a = c3.a;
  c3.a = c5.a;
@@ -2710 +2715 @@
  Real ec.x.c[2];
 equation
+ c[1].a[1:1] = zeros(1);
+ c[1].b = 0.0;
  - c[1].a[1:1] - ec.x.a[1:1] = zeros(1);
  - c[1].b - ec.x.b = 0.0;
@@ -2754 +2761 @@
  Real ec.x[2].c[2];
 equation
+ c[1].a[1:1] = zeros(1);
+ c[1].b = 0.0;
+ c[2].a[1:1] = zeros(1);
+ c[2].b = 0.0;
  - c[1].a[1:1] - ec.x[1].a[1:1] = zeros(1);
  - c[1].b - ec.x[1].b = 0.0;
@@ -2806 +2817 @@
  Real ec.x[2].c[2];
 equation
+ c[1].a[1:1] = zeros(1);
+ c[1].b = 0.0;
+ c[2].a[1:1] = zeros(1);
+ c[2].b = 0.0;
+ c[3].a[1:1] = zeros(1);
+ c[3].b = 0.0;
  - c[2].a[1:1] - ec.x[1].a[1:1] = zeros(1);
  - c[2].b - ec.x[1].b = 0.0;
@@ -2859 +2876 @@
  Real ec.x[3].c[2];
 equation
+ c1.a[1:1] = zeros(1);
+ c1.b = 0.0;
+ c2.a[1:1] = zeros(1);
+ c2.b = 0.0;
  - c1.a[1:1] - ec.x[1].a[1:1] = zeros(1);
  - c1.b - ec.x[1].b = 0.0;
@@ -2913 +2934 @@
  Real ec.x[2].b[3];
 equation
+ c[1].a[1:2] = zeros(2);
+ c[2].a[1:3] = zeros(3);
  - c[1].a[1:2] - ec.x[1].a[1:2] = zeros(2);
  c[1].b[1:2] = ec.x[1].b[1:2];
@@ -2962 +2985 @@
  Real ec.x[3].c;
 equation
+ c1.a = 0.0;
+ c2.a = 0.0;
  - c1.a - ec.x[1].a = 0.0;
  c1.b = inStream(ec.x[1].b);

trunk/Compiler/ModelicaFrontEnd/test/modelica/NameTests.mo

@@ -3813 +3813 @@
  - b1.af.x - b2.af.x = 0.0;
  b1.ap.x = b2.ap.x;
+ b1.af.x = 0.0;
+ b2.af.x = 0.0;
 end NameTests.InheritFlowTest1;
 ")})));

trunk/Compiler/ModelicaFrontEnd/test/modelica/OperatorRecordTests.mo

@@ -1498 +1498 @@
  c2.x = c3.x;
  OperatorRecordTests.Cplx.'-'.sub(OperatorRecordTests.Cplx.'-'.sub(OperatorRecordTests.Cplx.'-'.neg(c1.y), c2.y), c3.y) = OperatorRecordTests.Cplx.'0'();
+ c1.y = OperatorRecordTests.Cplx.'0'();
+ c2.y = OperatorRecordTests.Cplx.'0'();
+ c3.y = OperatorRecordTests.Cplx.'0'();
 
 public
@@ -1714 +1717 @@
  potential OperatorRecordTests.Cplx c.x;
  flow OperatorRecordTests.Cplx c.y;
+equation
+ c.y = OperatorRecordTests.Cplx.'0'();
 
 public

trunk/Compiler/ModelicaFrontEnd/test/modelica/OverconstrainedConnection.mo

@@ -335 +335 @@
  potential Real c1.x;
  flow Real c1.y;
+equation
+ c1.y = 0.0;
 end OverconstrainedConnection.OverconstrainedCorrect6;
 ")})));

trunk/Compiler/ModelicaFrontEnd/test/modelica/RedeclareTests.mo

@@ -7245 +7245 @@
 fclass RedeclareTests.Prefix.RedeclarePrefix9
  flow Real c.x;
+equation
+ c.x = 0.0;
 end RedeclareTests.Prefix.RedeclarePrefix9;
 ")})));
@@ -7270 +7272 @@
 equation
  - c1.x - c2.x = 0.0;
+ c1.x = 0.0;
+ c2.x = 0.0;
 end RedeclareTests.Prefix.RedeclarePrefix10;
 ")})));

trunk/Compiler/ModelicaFrontEnd/test/modelica/StreamTests.mo

@@ -229 +229 @@
             description="Using actualStream() on array of stream variables.",
             eliminate_alias_variables=false,
+            variability_propagation=false,
             flatModel="
 fclass StreamTests.StreamTest6
@@ -235 +236 @@
  stream Real d.b[2];
  potential Real d.c;
- constant Real f[1] = 1;
- constant Real f[2] = 2;
-equation
- 1.0 = d.b[1];
- 2.0 = d.b[2];
+ Real f[1];
+ Real f[2];
+equation
+ f[1] = d.b[1];
+ f[2] = d.b[2];
+ f[1] = 1;
+ f[2] = 2;
  d.c = 0;
+ d.a = 0.0;
 end StreamTests.StreamTest6;
 ")})));
@@ -270 +274 @@
             description="",
             eliminate_alias_variables=false,
+            variability_propagation=false,
             flatModel="
 fclass StreamTests.StreamTest7
@@ -286 +291 @@
  g.b = f.e.b;
  f.e.c = g.c;
+ g.a = 0.0;
 end StreamTests.StreamTest7;
 ")})));
@@ -595 +601 @@
  a.c.p = c.p;
  c.s = a.c.s;
+ c.f = 0.0;
  a.c.p = 2;
  a.c.s = 1;
@@ -799 +806 @@
  a2.c.p = c.p;
  c.s = (_stream_positiveMax_1 * a1.c.s + _stream_positiveMax_2 * a2.c.s) / (_stream_positiveMax_1 + _stream_positiveMax_2);
+ c.f = 0.0;
  a1.c.p = 4;
  a1.c.f = time;
@@ -877 +885 @@
  c1.s = (_stream_positiveMax_1 * a.c.s + _stream_positiveMax_2 * c2.s) / (_stream_positiveMax_1 + _stream_positiveMax_2);
  c2.s = (_stream_positiveMax_3 * a.c.s + _stream_positiveMax_4 * c1.s) / (_stream_positiveMax_3 + _stream_positiveMax_4);
+ c1.f = 0.0;
+ c2.f = 0.0;
  a.c.p = 2;
  a.c.s = 1;
@@ -1076 +1086 @@
  c1.s = (_stream_positiveMax_1 * a1.c.s + _stream_positiveMax_2 * a2.c.s + _stream_positiveMax_3 * c2.s) / (_stream_positiveMax_1 + _stream_positiveMax_2 + _stream_positiveMax_3);
  c2.s = (_stream_positiveMax_4 * a1.c.s + _stream_positiveMax_5 * a2.c.s + _stream_positiveMax_6 * c1.s) / (_stream_positiveMax_4 + _stream_positiveMax_5 + _stream_positiveMax_6);
+ c1.f = 0.0;
+ c2.f = 0.0;
  a1.c.p = 4;
  a1.c.f = time;
@@ -1163 +1175 @@
  c1.s = (_stream_positiveMax_1 * a2.c.s + _stream_positiveMax_2 * c2.s) / (_stream_positiveMax_1 + _stream_positiveMax_2);
  c2.s = a2.c.s;
+ c1.f = 0.0;
+ c2.f = 0.0;
  a1.c.p = 4;
  a1.c.f = time + 1;
@@ -1228 +1242 @@
  c1.s = a2.c.s;
  c2.s = a2.c.s;
+ c1.f = 0.0;
+ c2.f = 0.0;
  a1.c.p = 4;
  a1.c.f = time + 1;
@@ -1285 +1301 @@
  c1.s = c2.s;
  c2.s = 0.0;
+ c1.f = 0.0;
+ c2.f = 0.0;
  a1.c.p = 4;
  a1.c.f = time + 1;
@@ -1944 +1962 @@
  c1.s = (_stream_positiveMax_1 * a1.c.s + _stream_positiveMax_2 * a2.c.s + _stream_positiveMax_3 * c2.s) / (_stream_positiveMax_1 + _stream_positiveMax_2 + _stream_positiveMax_3);
  c2.s = (_stream_positiveMax_4 * a1.c.s + _stream_positiveMax_5 * a2.c.s + _stream_positiveMax_6 * c1.s) / (_stream_positiveMax_4 + _stream_positiveMax_5 + _stream_positiveMax_6);
+ c1.f = 0.0;
+ c2.f = 0.0;
  a1.c.p = 4;
  a1.c.f = 1;
@@ -2081 +2101 @@
  c1[2].s = (_stream_positiveMax_7 * a1[2].c.s + _stream_positiveMax_8 * a2[2].c.s + _stream_positiveMax_9 * c2[2].s) / (_stream_positiveMax_7 + _stream_positiveMax_8 + _stream_positiveMax_9);
  c2[2].s = (_stream_positiveMax_10 * a1[2].c.s + _stream_positiveMax_11 * a2[2].c.s + _stream_positiveMax_12 * c1[2].s) / (_stream_positiveMax_10 + _stream_positiveMax_11 + _stream_positiveMax_12);
+ c1[1].f = 0.0;
+ c1[2].f = 0.0;
+ c2[1].f = 0.0;
+ c2[2].f = 0.0;
  a1[1].c.p = 3;
  a1[1].c.f = 1;

trunk/Compiler/ModelicaMiddleEnd/module.options

@@ -64 +64 @@
 
 *******************************************************************************
+BOOLEAN causal_ports compiler experimental false
+
+"Treat top level connector variables as causal variables. Flow and instream
+variables as inputs, potential and stream variables as outputs."
+
+*******************************************************************************

trunk/Compiler/ModelicaMiddleEnd/src/jastadd/optimizations/AliasElimination.jrag

@@ -165 +165 @@
     eq FVariable.canBeAlias() = !getFAccess().myDerFV(order() + 1).isDummyDerivativeVariable() 
             && !isPreVariable() && !isNonDummyDerivativeVariable()
-            && !isInput() && !isOutput() && !isIndependentParameter()
+            && getCausalityConnectorPrefix().isNone() && !isIndependentParameter()
             && !isInterface();