Skip to content

Commit

Permalink
- Fixed bootstrapping.
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21300 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
perost committed Jun 26, 2014
1 parent b2495eb commit 1456d7c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Compiler/BackEnd/Tearing.mo
Expand Up @@ -800,7 +800,7 @@ algorithm
local
Integer tvar;
array<Integer> ass1_;
list<Integer> unassigned,rest,ass1List;
list<Integer> unassigned,rest,ass1List, unsolv;
BackendDAE.AdjacencyMatrixElementEnhanced vareqns;
// if there are no unsolvables choose tvar by heuristic
case ({},{},_,_,_,_,_,_,_,_,_,_,_,_,_,_,_)
Expand Down Expand Up @@ -848,7 +848,7 @@ algorithm
// mark tearing var
ass1List = markTVars(tSel_always,arrayList(ass1));
ass1_ = Util.arrayCopy(listArray(ass1List),ass1);
(_,unsolvables,_) = List.intersection1OnTrue(unsolvables,tSel_always,intEq);
(_,unsolv,_) = List.intersection1OnTrue(unsolvables,tSel_always,intEq);
// equations not yet assigned containing the tvars
vareqns = findVareqns(ass2,isAssignedSaveEnhanced,mt,tSel_always,{});
Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"Assignable equations containing new tvars:\n");
Expand All @@ -857,7 +857,7 @@ algorithm
tearingBFS(vareqns,m,mt,mapEqnIncRow,mapIncRowEqn,size,ass1_,ass2,columark,mark,{});
// check for unassigned vars, if there some rerun
unassigned = Matching.getUnassigned(size,ass1_,{});
(outTVars,oMark) = omcTearing3(unassigned,unsolvables,{},tSel_prefer,tSel_avoid,tSel_never,m,mt,mapEqnIncRow,mapIncRowEqn,size,vars,ishared,ass1_,ass2,columark,mark+1,listAppend(tSel_always,inTVars));
(outTVars,oMark) = omcTearing3(unassigned,unsolv,{},tSel_prefer,tSel_avoid,tSel_never,m,mt,mapEqnIncRow,mapIncRowEqn,size,vars,ishared,ass1_,ass2,columark,mark+1,listAppend(tSel_always,inTVars));
then
(outTVars,oMark);
else
Expand Down

0 comments on commit 1456d7c

Please sign in to comment.