Skip to content

Commit 2c53374

Browse files
author
Anton Sodja
committed
Added a field `aliasVars' to structure DAELow, where replacement
transformations for alias variables (originating from trivial equations) are stored. Currently, this field is ignored everywhere -- it will be only used in code generation in my own branch `omprof'. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5075 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent a15d95b commit 2c53374

File tree

9 files changed

+194
-151
lines changed

9 files changed

+194
-151
lines changed

‎Compiler/CevalScript.mo‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* This file is part of OpenModelica.
33
*
4-
* Copyright (c) 1998-2010, Linköpings University,
4+
* Copyright (c) 1998-2010, Link�pings University,
55
* Department of Computer and Information Science,
6-
* SE-58183 Linköping, Sweden.
6+
* SE-58183 Link�ping, Sweden.
77
*
88
* All rights reserved.
99
*
@@ -14,7 +14,7 @@
1414
*
1515
* The OpenModelica software and the Open Source Modelica
1616
* Consortium (OSMC) Public License (OSMC-PL) are obtained
17-
* from Linköpings University, either from the above address,
17+
* from Link�pings University, either from the above address,
1818
* from the URL: http://www.ida.liu.se/projects/OpenModelica
1919
* and in the OpenModelica distribution.
2020
*
@@ -256,7 +256,7 @@ algorithm
256256
dae = DAEUtil.transformIfEqToExpr(dae,false);
257257
ic_1 = Interactive.addInstantiatedClass(ic, Interactive.INSTCLASS(path,dae,env));
258258
/*((daelow as DAELow.DAELOW(orderedVars=vars,orderedEqs=eqnarr,complexEqns = DAELow.COMPLEX_EQUATIONS(arrayEqs=ae,ifEqns=ifeqns)))) = DAELow.lower(dae, false, true) "no dummy state" ;*/
259-
((daelow as DAELow.DAELOW(vars,_,_,eqnarr,_,_,ae,_,_,_))) = DAELow.lower(dae, false, true) "no dummy state" ;
259+
((daelow as DAELow.DAELOW(vars,_,_,_,eqnarr,_,_,ae,_,_,_))) = DAELow.lower(dae, false, true) "no dummy state" ;
260260
m = DAELow.incidenceMatrix(daelow);
261261
mt = DAELow.transposeMatrix(m);
262262
/* jac = DAELow.calculateJacobian(vars, eqnarr, ae,ifeqns, m, mt,false); */
@@ -1161,11 +1161,11 @@ algorithm
11611161
equation
11621162
print("visualize(model)\n");
11631163

1164-
//Här ska jag komma in, bygga en vettig argumentlista till readptol...
1164+
//H�r ska jag komma in, bygga en vettig argumentlista till readptol...
11651165

1166-
//Jag måste få readptol att skicka alla variabler i .plt-filen, och en idé är
1167-
//att göra en egen enkel funktion som i princip är en grep på DataSet: i filen..
1168-
//Kolla på senddata:emulateStreamData
1166+
//Jag m�ste f� readptol att skicka alla variabler i .plt-filen, och en id� �r
1167+
//att g�ra en egen enkel funktion som i princip �r en grep p� DataSet: i filen..
1168+
//Kolla p� senddata:emulateStreamData
11691169

11701170
//vars = Util.listMap(vars,Exp.CodeVarToCref);
11711171
//vars = Util.listMap(vars, Exp.printExpStr) "plot" ;
@@ -1232,7 +1232,7 @@ algorithm
12321232
Boolean legend, logX, logY, points;
12331233
Boolean grid;
12341234
equation
1235-
print("hittaderättigen\n");
1235+
print("hittader�ttigen\n");
12361236
vars = Util.listMap(vars,Exp.CodeVarToCref);
12371237
vars_1 = Util.listMap(vars, Exp.printExpStr) "plot" ;
12381238
vars_2 = Util.listUnionElt("time", vars_1);

‎Compiler/DAELow.mo‎

Lines changed: 85 additions & 64 deletions
Large diffs are not rendered by default.

‎Compiler/DAEQuery.mo‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* This file is part of OpenModelica.
33
*
4-
* Copyright (c) 1998-2010, Linköpings University,
4+
* Copyright (c) 1998-2010, Link�pings University,
55
* Department of Computer and Information Science,
6-
* SE-58183 Linköping, Sweden.
6+
* SE-58183 Link�ping, Sweden.
77
*
88
* All rights reserved.
99
*
@@ -14,7 +14,7 @@
1414
*
1515
* The OpenModelica software and the Open Source Modelica
1616
* Consortium (OSMC) Public License (OSMC-PL) are obtained
17-
* from Linköpings University, either from the above address,
17+
* from Link�pings University, either from the above address,
1818
* from the URL: http://www.ida.liu.se/projects/OpenModelica
1919
* and in the OpenModelica distribution.
2020
*
@@ -83,24 +83,17 @@ algorithm
8383
strEqs:=
8484
matchcontinue (inDAELow)
8585
local
86-
list<DAELow.Var> vars,knvars,extvars;
87-
Integer varlen,eqnlen;
88-
String varlen_str,eqnlen_str,s,s1,s2,s3;
89-
list<String> ls1,ls2,ls3;
90-
list<DAELow.Equation> eqnsl,reqnsl,ieqnsl;
86+
String s,s1;
87+
list<String> ls1;
88+
list<DAELow.Equation> eqnsl;
9189
list<String> ss;
92-
list<DAELow.MultiDimEquation> ae_lst;
93-
DAELow.Variables vars1,vars2,vars3;
94-
DAELow.EquationArray eqns,reqns,ieqns;
95-
DAELow.MultiDimEquation[:] ae;
96-
Algorithm.Algorithm[:] algs;
97-
list<DAELow.ZeroCrossing> zc;
98-
DAELow.ExternalObjectClasses extObjCls;
90+
DAELow.EquationArray eqns;
9991
list<DAELow.WhenClause> wcLst;
100-
case (DAELow.DAELOW(vars1,vars2,vars3,eqns,reqns,ieqns,ae,algs,DAELow.EVENT_INFO(whenClauseLst = wcLst),extObjCls))
92+
case (DAELow.DAELOW(orderedEqs = eqns, eventInfo = DAELow.EVENT_INFO(whenClauseLst = wcLst)))
10193
equation
10294
eqnsl = DAELow.equationList(eqns);
103-
ls1 = Util.listMap1(eqnsl, equationStr, wcLst); s1 = Util.stringDelimitList(ls1, ",");
95+
ls1 = Util.listMap1(eqnsl, equationStr, wcLst);
96+
s1 = Util.stringDelimitList(ls1, ",");
10497
s = "EqStr = {" +& s1 +& "};";
10598
then
10699
s;
@@ -249,19 +242,10 @@ algorithm
249242
strVars:=
250243
matchcontinue (inDAELow)
251244
local
252-
list<DAELow.Var> vars,knvars,extvars;
253-
Integer varlen,eqnlen;
254-
String varlen_str,eqnlen_str,s;
255-
list<DAELow.Equation> eqnsl,reqnsl,ieqnsl;
256-
list<String> ss;
257-
list<DAELow.MultiDimEquation> ae_lst;
258-
DAELow.Variables vars1,vars2,vars3;
259-
DAELow.EquationArray eqns,reqns,ieqns;
260-
DAELow.MultiDimEquation[:] ae;
261-
Algorithm.Algorithm[:] algs;
262-
list<DAELow.ZeroCrossing> zc;
263-
DAELow.ExternalObjectClasses extObjCls;
264-
case (DAELow.DAELOW(vars1,vars2,vars3,eqns,reqns,ieqns,ae,algs,DAELow.EVENT_INFO(zeroCrossingLst = zc),extObjCls))
245+
list<DAELow.Var> vars;
246+
String s;
247+
DAELow.Variables vars1;
248+
case (DAELow.DAELOW(orderedVars = vars1))
265249
equation
266250
vars = varList(vars1);
267251
s = dumpVars(vars);

‎Compiler/Inline.mo‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* This file is part of OpenModelica.
33
*
4-
* Copyright (c) 1998-2010, Linköpings University,
4+
* Copyright (c) 1998-2010, Link�pings University,
55
* Department of Computer and Information Science,
6-
* SE-58183 Linköping, Sweden.
6+
* SE-58183 Link�ping, Sweden.
77
*
88
* All rights reserved.
99
*
@@ -14,7 +14,7 @@
1414
*
1515
* The OpenModelica software and the Open Source Modelica
1616
* Consortium (OSMC) Public License (OSMC-PL) are obtained
17-
* from Linköpings University, either from the above address,
17+
* from Link�pings University, either from the above address,
1818
* from the URL: http://www.ida.liu.se/projects/OpenModelica
1919
* and in the OpenModelica distribution.
2020
*
@@ -54,6 +54,7 @@ protected import Algorithm;
5454
protected import Debug;
5555
protected import DAEUtil;
5656
protected import Exp;
57+
protected import VarTransform;
5758

5859
public function inlineCalls
5960
"function: inlineCalls
@@ -68,6 +69,7 @@ algorithm
6869
DAELow.Variables orderedVars;
6970
DAELow.Variables knownVars;
7071
DAELow.Variables externalObjects;
72+
VarTransform.VariableReplacements aliasVars "alias-variables' hashtable";
7173
DAELow.EquationArray orderedEqs;
7274
DAELow.EquationArray removedEqs;
7375
DAELow.EquationArray initialEqs;
@@ -77,7 +79,7 @@ algorithm
7779
list<Algorithm.Algorithm> alglst;
7880
DAELow.EventInfo eventInfo;
7981
DAELow.ExternalObjectClasses extObjClasses;
80-
case(fns,DAELow.DAELOW(orderedVars,knownVars,externalObjects,orderedEqs,removedEqs,initialEqs,arrayEqs,algorithms,eventInfo,extObjClasses))
82+
case(fns,DAELow.DAELOW(orderedVars,knownVars,externalObjects,aliasVars,orderedEqs,removedEqs,initialEqs,arrayEqs,algorithms,eventInfo,extObjClasses))
8183
equation
8284
orderedVars = inlineVariables(orderedVars,fns);
8385
knownVars = inlineVariables(knownVars,fns);
@@ -92,7 +94,7 @@ algorithm
9294
eventInfo = inlineEventInfo(eventInfo,fns);
9395
extObjClasses = inlineExtObjClasses(extObjClasses,fns);
9496
then
95-
DAELow.DAELOW(orderedVars,knownVars,externalObjects,orderedEqs,removedEqs,initialEqs,arrayEqs,algorithms,eventInfo,extObjClasses);
97+
DAELow.DAELOW(orderedVars,knownVars,externalObjects,aliasVars,orderedEqs,removedEqs,initialEqs,arrayEqs,algorithms,eventInfo,extObjClasses);
9698
case(_,_)
9799
equation
98100
Debug.fprintln("failtrace","Inline.inlineCalls failed");

‎Compiler/PartFn.mo‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* This file is part of OpenModelica.
33
*
4-
* Copyright (c) 1998-2010, Linköpings University,
4+
* Copyright (c) 1998-2010, Link�pings University,
55
* Department of Computer and Information Science,
6-
* SE-58183 Linköping, Sweden.
6+
* SE-58183 Link�ping, Sweden.
77
*
88
* All rights reserved.
99
*
@@ -14,7 +14,7 @@
1414
*
1515
* The OpenModelica software and the Open Source Modelica
1616
* Consortium (OSMC) Public License (OSMC-PL) are obtained
17-
* from Linköpings University, either from the above address,
17+
* from Link�pings University, either from the above address,
1818
* from the URL: http://www.ida.liu.se/projects/OpenModelica
1919
* and in the OpenModelica distribution.
2020
*
@@ -50,6 +50,7 @@ protected import DAEUtil;
5050
protected import Exp;
5151
protected import Types;
5252
protected import Util;
53+
protected import VarTransform;
5354

5455
type Ident = String;
5556

@@ -68,6 +69,7 @@ algorithm
6869
DAELow.Variables orderedVars;
6970
DAELow.Variables knownVars;
7071
DAELow.Variables externalObjects;
72+
VarTransform.VariableReplacements aliasVars "alias-variables' hashtable";
7173
DAELow.EquationArray orderedEqs;
7274
DAELow.EquationArray removedEqs;
7375
DAELow.EquationArray initialEqs;
@@ -80,7 +82,7 @@ algorithm
8082
false = RTOpts.debugFlag("fnptr") or RTOpts.acceptMetaModelicaGrammar();
8183
then
8284
(dae,dlow);*/
83-
case(dae,DAELow.DAELOW(orderedVars,knownVars,externalObjects,orderedEqs,removedEqs,initialEqs,arrayEqs,algorithms,eventInfo,extObjClasses))
85+
case(dae,DAELow.DAELOW(orderedVars,knownVars,externalObjects,aliasVars,orderedEqs,removedEqs,initialEqs,arrayEqs,algorithms,eventInfo,extObjClasses))
8486
equation
8587
(orderedVars,dae) = partEvalVars(orderedVars,dae);
8688
(knownVars,dae) = partEvalVars(knownVars,dae);
@@ -91,7 +93,7 @@ algorithm
9193
(arrayEqs,dae) = partEvalArrEqs(arrayList(arrayEqs),dae);
9294
(algorithms,dae) = partEvalAlgs(algorithms,dae);
9395
then
94-
(dae,DAELow.DAELOW(orderedVars,knownVars,externalObjects,orderedEqs,removedEqs,initialEqs,arrayEqs,algorithms,eventInfo,extObjClasses));
96+
(dae,DAELow.DAELOW(orderedVars,knownVars,externalObjects,aliasVars,orderedEqs,removedEqs,initialEqs,arrayEqs,algorithms,eventInfo,extObjClasses));
9597
case(_,_)
9698
equation
9799
Debug.fprintln("failtrace","- PartFn.partEvalDAELow failed");

‎Compiler/SimCode.mo‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,6 +1981,7 @@ algorithm
19811981
list<DAELow.Equation> eqn_lst,cont_eqn,disc_eqn;
19821982
list<DAELow.Var> var_lst,cont_var,disc_var,var_lst_1,cont_var1;
19831983
DAELow.Variables vars_1,vars,knvars,exvars;
1984+
VarTransform.VariableReplacements av "alias-variables' hashtable";
19841985
DAELow.EquationArray eqns_1,eqns,se,ie;
19851986
DAELow.DAELow cont_subsystem_dae,daelow,subsystem_dae,dlow;
19861987
list<Integer>[:] m,m_1,mt_1;
@@ -2000,7 +2001,7 @@ algorithm
20002001
list<String> values;
20012002
list<Integer> value_dims;
20022003
/* mixed system of equations, continuous part only */
2003-
case (false,(daelow as DAELow.DAELOW(vars,knvars,exvars,eqns,se,ie,ae,al, ev,eoc)),ass1,ass2,block_)
2004+
case (false,(daelow as DAELow.DAELOW(vars,knvars,exvars,av,eqns,se,ie,ae,al, ev,eoc)),ass1,ass2,block_)
20042005
equation
20052006
(eqn_lst,var_lst) = Util.listMap32(block_, getEquationAndSolvedVar, eqns, vars, ass2);
20062007
true = isMixedSystem(var_lst,eqn_lst);
@@ -2009,7 +2010,7 @@ algorithm
20092010
cont_var1 = Util.listMap(cont_var, transformXToXd);
20102011
vars_1 = DAELow.listVar(cont_var1);
20112012
eqns_1 = DAELow.listEquation(cont_eqn);
2012-
cont_subsystem_dae = DAELow.DAELOW(vars_1,knvars,exvars,eqns_1,se,ie,ae,al,ev,eoc);
2013+
cont_subsystem_dae = DAELow.DAELOW(vars_1,knvars,exvars,av,eqns_1,se,ie,ae,al,ev,eoc);
20132014
m = DAELow.incidenceMatrix(cont_subsystem_dae);
20142015
m_1 = DAELow.absIncidenceMatrix(m);
20152016
mt_1 = DAELow.transposeMatrix(m_1);
@@ -2020,7 +2021,7 @@ algorithm
20202021
then
20212022
equation_;
20222023
/* mixed system of equations, both continous and discrete eqns*/
2023-
case (true,(dlow as DAELow.DAELOW(vars,knvars,exvars,eqns,se,ie,ae,al, ev,eoc)),ass1,ass2,block_)
2024+
case (true,(dlow as DAELow.DAELOW(vars,knvars,exvars,av,eqns,se,ie,ae,al, ev,eoc)),ass1,ass2,block_)
20242025
equation
20252026
(eqn_lst,var_lst) = Util.listMap32(block_, getEquationAndSolvedVar, eqns, vars, ass2);
20262027
true = isMixedSystem(var_lst,eqn_lst);
@@ -2029,7 +2030,7 @@ algorithm
20292030
cont_var1 = Util.listMap(cont_var, transformXToXd);
20302031
vars_1 = DAELow.listVar(cont_var1);
20312032
eqns_1 = DAELow.listEquation(cont_eqn);
2032-
cont_subsystem_dae = DAELow.DAELOW(vars_1,knvars,exvars,eqns_1,se,ie,ae,al,ev,eoc);
2033+
cont_subsystem_dae = DAELow.DAELOW(vars_1,knvars,exvars,av,eqns_1,se,ie,ae,al,ev,eoc);
20332034
m = DAELow.incidenceMatrix(cont_subsystem_dae);
20342035
m_1 = DAELow.absIncidenceMatrix(m);
20352036
mt_1 = DAELow.transposeMatrix(m_1);
@@ -2053,7 +2054,7 @@ algorithm
20532054
then
20542055
SES_MIXED(equation_, simVarsDisc, discEqs, values, value_dims);
20552056
/* continuous system of equations try tearing algorithm*/
2056-
case (genDiscrete,(daelow as DAELow.DAELOW(vars,knvars,exvars,eqns,se,ie,ae,al,ev,eoc)),ass1,ass2,block_)
2057+
case (genDiscrete,(daelow as DAELow.DAELOW(vars,knvars,exvars,av,eqns,se,ie,ae,al,ev,eoc)),ass1,ass2,block_)
20572058
local
20582059
DAELow.DAELow subsystem_dae_1,subsystem_dae_2;
20592060
Integer[:] v1,v2,v1_1,v2_1;
@@ -2070,7 +2071,7 @@ algorithm
20702071
var_lst_1 = Util.listMap(var_lst, transformXToXd); // States are solved for der(x) not x.
20712072
vars_1 = DAELow.listVar(var_lst_1);
20722073
eqns_1 = DAELow.listEquation(eqn_lst);
2073-
subsystem_dae = DAELow.DAELOW(vars_1,knvars,exvars,eqns_1,se,ie,ae,al,ev,eoc) "not used" ;
2074+
subsystem_dae = DAELow.DAELOW(vars_1,knvars,exvars,av,eqns_1,se,ie,ae,al,ev,eoc) "not used" ;
20742075
m = DAELow.incidenceMatrix(subsystem_dae);
20752076
m_1 = DAELow.absIncidenceMatrix(m);
20762077
mt_1 = DAELow.transposeMatrix(m_1);
@@ -2088,15 +2089,15 @@ algorithm
20882089
then
20892090
equation_;
20902091
/* continuous system of equations */
2091-
case (genDiscrete,(daelow as DAELow.DAELOW(vars,knvars,exvars,eqns,se,ie,ae,al,ev,eoc)),ass1,ass2,block_)
2092+
case (genDiscrete,(daelow as DAELow.DAELOW(vars,knvars,exvars,av,eqns,se,ie,ae,al,ev,eoc)),ass1,ass2,block_)
20922093
equation
20932094
// extract the variables and equations of the block.
20942095
(eqn_lst,var_lst) = Util.listMap32(block_, getEquationAndSolvedVar, eqns, vars, ass2);
20952096
// States are solved for der(x) not x.
20962097
var_lst_1 = Util.listMap(var_lst, transformXToXd);
20972098
vars_1 = DAELow.listVar(var_lst_1);
20982099
eqns_1 = DAELow.listEquation(eqn_lst);
2099-
subsystem_dae = DAELow.DAELOW(vars_1,knvars,exvars,eqns_1,se,ie,ae,al,ev,eoc);
2100+
subsystem_dae = DAELow.DAELOW(vars_1,knvars,exvars,av,eqns_1,se,ie,ae,al,ev,eoc);
21002101
m = DAELow.incidenceMatrix(subsystem_dae);
21012102
m_1 = DAELow.absIncidenceMatrix(m);
21022103
mt_1 = DAELow.transposeMatrix(m_1);
@@ -2141,6 +2142,7 @@ algorithm
21412142
Option<list<tuple<Integer, Integer, DAELow.Equation>>> jac;
21422143
DAELow.JacobianType jac_tp;
21432144
DAELow.Variables v,kv,exv;
2145+
VarTransform.VariableReplacements av "alias-variables' hashtable";
21442146
DAELow.EquationArray eqn,eqn1,reeqn,ineq;
21452147
list<DAELow.Equation> eqn_lst,eqn_lst1,eqn_lst2,reqns;
21462148
list<DAELow.Var> var_lst;
@@ -2154,7 +2156,7 @@ algorithm
21542156
DAELow.ExternalObjectClasses extObjClasses;
21552157
list<SimEqSystem> simeqnsystem,simeqnsystem1,resEqs;
21562158
case (ass1,ass2,block_,r,t,mixedEvent,_,
2157-
daelow as DAELow.DAELOW(orderedVars=v,knownVars=kv,externalObjects=exv,orderedEqs=eqn,removedEqs=reeqn,initialEqs=ineq,arrayEqs=ae,algorithms=algorithms,eventInfo=eventInfo,extObjClasses=extObjClasses),jac,jac_tp)
2159+
daelow as DAELow.DAELOW(orderedVars=v,knownVars=kv,externalObjects=exv,aliasVars=av,orderedEqs=eqn,removedEqs=reeqn,initialEqs=ineq,arrayEqs=ae,algorithms=algorithms,eventInfo=eventInfo,extObjClasses=extObjClasses),jac,jac_tp)
21582160
/* no analythic jacobian available. Generate non-linear system */
21592161
equation
21602162
// get equations and variables
@@ -2175,7 +2177,7 @@ algorithm
21752177
// replace tearing variables in other equations with x_loc[..]
21762178
eqn_lst2 = generateTearingSystem1(eqn_lst,repl);
21772179
eqn1 = DAELow.listEquation(eqn_lst2);
2178-
daelow1=DAELow.DAELOW(v,kv,exv,eqn1,reeqn,ineq,ae,algorithms,eventInfo,extObjClasses);
2180+
daelow1=DAELow.DAELOW(v,kv,exv,av,eqn1,reeqn,ineq,ae,algorithms,eventInfo,extObjClasses);
21792181
// generade code for other equations
21802182
simeqnsystem = Util.listMap3(block_1,createEquation,daelow1, ass1, ass2);
21812183
resEqs = createNonlinearResidualEquations(reqns, ae, repl);
@@ -2914,6 +2916,7 @@ algorithm
29142916
list<DAELow.Equation> eqn_lst,cont_eqn,disc_eqn;
29152917
list<DAELow.Var> var_lst,cont_var,disc_var,cont_var1;
29162918
DAELow.Variables vars, vars_1,knvars,exvars;
2919+
VarTransform.VariableReplacements av "alias-variables' hashtable";
29172920
DAELow.EquationArray eqns_1,eqns,se,ie;
29182921
DAELow.DAELow cont_subsystem_dae,dlow;
29192922
list<Integer>[:] m,m_1,mt_1;
@@ -2932,7 +2935,7 @@ algorithm
29322935
case (_,_,_,_,{},_)
29332936
then {};
29342937
/* zero crossing for mixed system */
2935-
case (dae, (dlow as DAELow.DAELOW(vars, knvars, exvars, eqns, se, ie, ae,
2938+
case (dae, (dlow as DAELow.DAELOW(vars, knvars, exvars, av, eqns, se, ie, ae,
29362939
al, ev, eoc)),
29372940
ass1, ass2, (eqn :: rest), blocks)
29382941
equation
@@ -3446,6 +3449,7 @@ algorithm
34463449
DAELow.Variables orderedVars;
34473450
DAELow.Variables knownVars;
34483451
DAELow.Variables externalObjects;
3452+
VarTransform.VariableReplacements aliasVars "alias-variables' hashtable";
34493453
DAELow.EquationArray orderedEqs;
34503454
DAELow.EquationArray removedEqs;
34513455
DAELow.EquationArray initialEqs;
@@ -3454,12 +3458,12 @@ algorithm
34543458
list<Algorithm.Algorithm> algLst;
34553459
DAELow.EventInfo eventInfo;
34563460
DAELow.ExternalObjectClasses extObjClasses;
3457-
case (helpvars,DAELow.DAELOW(orderedVars,knownVars,externalObjects,orderedEqs,
3461+
case (helpvars,DAELow.DAELOW(orderedVars,knownVars,externalObjects,aliasVars,orderedEqs,
34583462
removedEqs,initialEqs,arrayEqs,algorithms,eventInfo,extObjClasses))
34593463
equation
34603464
(helpvars1,algLst,_) = generateHelpVarsInAlgorithms(listLength(helpvars),arrayList(algorithms));
34613465
algorithms2 = listArray(algLst);
3462-
then (listAppend(helpvars,helpvars1),DAELow.DAELOW(orderedVars,knownVars,externalObjects,orderedEqs,
3466+
then (listAppend(helpvars,helpvars1),DAELow.DAELOW(orderedVars,knownVars,externalObjects,aliasVars,orderedEqs,
34633467
removedEqs,initialEqs,arrayEqs,algorithms2,eventInfo,extObjClasses));
34643468
case (_,_)
34653469
equation

0 commit comments

Comments
 (0)