Skip to content

Commit aee9b98

Browse files
[Janitor mode] Fix whitespace
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21037 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 07cfc73 commit aee9b98

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

Compiler/BackEnd/Tearing.mo

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -327,10 +327,10 @@ algorithm
327327
Debug.fcall(Flags.TEARING_DUMPVERBOSE, print,"\n\nUnsolvable Vars:\n");
328328
Debug.fcall(Flags.TEARING_DUMPVERBOSE, BackendDump.debuglst,(unsolvables,intString,", ","\n"));
329329
columark := arrayCreate(size,-1);
330-
330+
331331
// If '+showAnnotations=true': Collect variables with annotation attribute 'tearingSelect=always', 'tearingSelect=prefer', 'tearingSelect=avoid' and 'tearingSelect=never'
332332
((tSel_always,tSel_prefer,tSel_avoid,tSel_never)) := tearingSelect(var_lst,{},{},{},{},1);
333-
333+
334334
// determine tvars and do cheap matching until a maximum matching is there
335335
// if cheap matching stucks select additional tearing variable and continue
336336
// (mark+1 for every call of omcTearing3)
@@ -824,8 +824,8 @@ algorithm
824824
// if there are unsolvables choose unsolvables as tvars
825825
case (tvar::rest,{},_,_,_,_,_,_,_,_,_,_,_,_,_,_,_)
826826
equation
827-
Debug.bcall(listMember(tvar,tSel_never), Error.addCompilerWarning, "There are tearing variables with annotation attribute 'tearingSelect = never'. Use +d=tearingdump and +d=tearingdumpV for more information.");
828-
Debug.fcall(Flags.TEARING_DUMP, print,"\nForced selection of Tearing Variable:\n" +& UNDERLINE +& "\n");
827+
Debug.bcall(listMember(tvar,tSel_never), Error.addCompilerWarning, "There are tearing variables with annotation attribute 'tearingSelect = never'. Use +d=tearingdump and +d=tearingdumpV for more information.");
828+
Debug.fcall(Flags.TEARING_DUMP, print,"\nForced selection of Tearing Variable:\n" +& UNDERLINE +& "\n");
829829
Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"tVar: " +& intString(tvar) +& " (unsolvable in omcTearing2)\n\n\n");
830830
// mark tearing var
831831
_ = arrayUpdate(ass1,tvar,size*2);
@@ -842,13 +842,13 @@ algorithm
842842
(outTVars,oMark);
843843
case (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_)
844844
equation
845-
Debug.fcall(Flags.TEARING_DUMP, print,"\nForced selection of Tearing Variables:\n" +& UNDERLINE +& "\n");
845+
Debug.fcall(Flags.TEARING_DUMP, print,"\nForced selection of Tearing Variables:\n" +& UNDERLINE +& "\n");
846846
Debug.fcall(Flags.TEARING_DUMP, print,"Variables with annotation attribute 'always' as tVars: " +& stringDelimitList(List.map(tSel_always,intString),",")+&"\n");
847847
// mark tearing var
848-
ass1List = markTVars(tSel_always,arrayList(ass1));
849-
ass1 = Util.arrayCopy(listArray(ass1List),ass1);
848+
ass1List = markTVars(tSel_always,arrayList(ass1));
849+
ass1 = Util.arrayCopy(listArray(ass1List),ass1);
850850
// equations not yet assigned containing the tvars
851-
vareqns = findVareqns(ass2,isAssignedSaveEnhanced,mt,tSel_always,{});
851+
vareqns = findVareqns(ass2,isAssignedSaveEnhanced,mt,tSel_always,{});
852852
Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"Assignable equations containing new tvars:\n");
853853
Debug.fcall(Flags.TEARING_DUMPVERBOSE,BackendDump.dumpAdjacencyRowEnhanced,vareqns);Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"\n");
854854
// cheap matching
@@ -884,14 +884,14 @@ protected function findVareqns
884884
algorithm
885885
vareqnsOut := matchcontinue(ass2In,inCompFunc,mt,tSel_alwaysIn,vareqnsIn)
886886
local
887-
Integer tvar;
887+
Integer tvar;
888888
list<Integer> rest;
889-
list<tuple<Integer,BackendDAE.Solvability>> vareqns;
890-
case(_,_,_,{},_)
889+
list<tuple<Integer,BackendDAE.Solvability>> vareqns;
890+
case(_,_,_,{},_)
891891
then List.unique(vareqnsIn);
892-
case(_,_,_,tvar::rest,_)
893-
equation
894-
vareqns = List.removeOnTrue(ass2In,inCompFunc,mt[tvar]);
892+
case(_,_,_,tvar::rest,_)
893+
equation
894+
vareqns = List.removeOnTrue(ass2In,inCompFunc,mt[tvar]);
895895
then findVareqns(ass2In,inCompFunc,mt,rest,listAppend(vareqnsIn,vareqns));
896896
end matchcontinue;
897897
end findVareqns;
@@ -936,8 +936,8 @@ algorithm
936936
unsolvables = getUnsolvableVarsConsiderMatching(1,BackendVariable.varsSize(vars),mt,ass1,ass2,{});
937937
false = List.isEmpty(unsolvables);
938938
tvar = listGet(unsolvables,1);
939-
Debug.bcall(listMember(tvar,tSel_never), Error.addCompilerWarning, "There are tearing variables with annotation attribute 'tearingSelect = never'. Use +d=tearingdump and +d=tearingdumpV for more information.");
940-
Debug.fcall(Flags.TEARING_DUMP, print,"\nForced selection of Tearing Variable:\n" +& UNDERLINE +& "\n");
939+
Debug.bcall(listMember(tvar,tSel_never), Error.addCompilerWarning, "There are tearing variables with annotation attribute 'tearingSelect = never'. Use +d=tearingdump and +d=tearingdumpV for more information.");
940+
Debug.fcall(Flags.TEARING_DUMP, print,"\nForced selection of Tearing Variable:\n" +& UNDERLINE +& "\n");
941941
Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"tVar: " +& intString(tvar) +& " (unsolvable in omcTearingSelectTearingVar)\n\n");
942942
then
943943
tvar;
@@ -949,8 +949,8 @@ algorithm
949949
freeVars = Matching.getUnassigned(varsize,ass1,{});
950950
Debug.fcall(Flags.TEARING_DUMPVERBOSE, print,"omcTearingSelectTearingVar Candidates(unassigned vars):\n");
951951
Debug.fcall(Flags.TEARING_DUMPVERBOSE, BackendDump.debuglst,(freeVars,intString,", ","\n"));
952-
(_,freeVars,_) = List.intersection1OnTrue(freeVars,tSel_never,intEq);
953-
Debug.fcall(Flags.TEARING_DUMPVERBOSE, print,"Candidates without variables with annotation attribute 'never':\n");
952+
(_,freeVars,_) = List.intersection1OnTrue(freeVars,tSel_never,intEq);
953+
Debug.fcall(Flags.TEARING_DUMPVERBOSE, print,"Candidates without variables with annotation attribute 'never':\n");
954954
Debug.fcall(Flags.TEARING_DUMPVERBOSE, BackendDump.debuglst,(freeVars,intString,", ","\n"));
955955
size = listLength(freeVars);
956956
true = intGt(size,0);
@@ -967,16 +967,16 @@ algorithm
967967
// 3rd: only one-tenth of points for each discrete variable
968968
points = List.fold1(freeVars,discriminateDiscrete,vars,points);
969969
Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"Points after 'discriminateDiscrete':\n" +& stringDelimitList(List.map(arrayList(points),intString),",") +& "\n\n");
970-
// 4th: Prefer variables with annotation attribute 'tearingSelect=prefer'
970+
// 4th: Prefer variables with annotation attribute 'tearingSelect=prefer'
971971
pointsLst = preferAvoidVariables(freeVars, arrayList(points), tSel_prefer, 3.0, 1);
972972
Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"Points after preferring variables with attribute 'prefer':\n" +& stringDelimitList(List.map(pointsLst,intString),",") +& "\n\n");
973-
// 5th: Avoid variables with annotation attribute 'tearingSelect=avoid'
973+
// 5th: Avoid variables with annotation attribute 'tearingSelect=avoid'
974974
pointsLst = preferAvoidVariables(freeVars, pointsLst, tSel_avoid, 0.334, 1);
975975
Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"Points after discrimination against variables with attribute 'avoid':\n" +& stringDelimitList(List.map(pointsLst,intString),",") +& "\n\n");
976976
tvar = selectVarWithMostPoints(freeVars,pointsLst,-1,-1);
977977
// Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"VarsWithMostEqns:\n");
978978
// Debug.fcall(Flags.TEARING_DUMPVERBOSE,BackendDump.debuglst,(freeVars,intString,", ","\n"));
979-
Debug.bcall(listMember(tvar,tSel_avoid), Error.addCompilerWarning, "The Tearing heuristic has chosen variables with annotation attribute 'tearingSelect = avoid'. Use +d=tearingdump and +d=tearingdumpV for more information.");
979+
Debug.bcall(listMember(tvar,tSel_avoid), Error.addCompilerWarning, "The Tearing heuristic has chosen variables with annotation attribute 'tearingSelect = avoid'. Use +d=tearingdump and +d=tearingdumpV for more information.");
980980
Debug.fcall(Flags.TEARING_DUMPVERBOSE,print,"tVar: " +& intString(tvar) +& " (" +& intString(listGet(pointsLst,tvar)) +& " points)\n\n");
981981
then
982982
tvar;

0 commit comments

Comments
 (0)