Changeset 6a1e39bc in OpenModelica

Timestamp:

2016-04-05T16:10:28+02:00 (8 years ago)

Author:

hkiel <henning.kiel@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

9027e889

Parents:

6c0fc0dd

Message:

recursion -> loop

File:

• Compiler/FrontEnd/ConnectionGraph.mo (modified) (1 diff)

Compiler/FrontEnd/ConnectionGraph.mo

@@ -748 +748 @@
   input list<tuple<String,String>> inUserSelectedBreaking;
   output DaeEdges outOrderedConnections;
-algorithm
-  outOrderedConnections := match(inConnections, inUserSelectedBreaking)
-    local
-      String sc1,sc2;
-      DAE.ComponentRef c1, c2;
-      DaeEdge e;
-      list<DAE.Element> els;
-      DaeEdges rest, ordered;
-      Boolean  b1, b2;
-
-    // handle empty case
-    case ({}, _) then {};
-
-    // handle match and miss
-    case ((e as (c1, c2, _))::rest, _)
-      equation
-        sc1 = ComponentReference.printComponentRefStr(c1);
-        sc2 = ComponentReference.printComponentRefStr(c2);
-        ordered = orderConnectsGuidedByUser(rest, inUserSelectedBreaking);
-        // see both ways!
-        b1 = listMember((sc1, sc2), inUserSelectedBreaking);
-        b2 = listMember((sc2, sc1), inUserSelectedBreaking);
-        if b1 or b2 then
-          // put them at the end to be tried last (more chance to be broken)
-          ordered = List.appendElt(e, ordered);
-        else
-          // put them at the front to be tried first (less chance to be broken)
-          ordered = e::ordered;
-        end if;
-      then
-        ordered;
-
-  end match;
+protected
+  DaeEdges front = {};
+  DaeEdges back = {};
+  DAE.ComponentRef c1, c2;
+  String sc1,sc2;
+algorithm
+  for e in inConnections loop
+    (c1, c2, _) := e;
+    sc1 := ComponentReference.printComponentRefStr(c1);
+    sc2 := ComponentReference.printComponentRefStr(c2);
+
+    if listMember((sc1, sc2), inUserSelectedBreaking) or listMember((sc2, sc1), inUserSelectedBreaking) then
+      // put them at the end to be tried last (more chance to be broken)
+      back := e::back;
+    else
+      // put them at the front to be tried first (less chance to be broken)
+      front := e::front;
+    end if;
+  end for;
+  outOrderedConnections := List.append_reverse(front, back);
 end orderConnectsGuidedByUser;