Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
preprocessor
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dynare
preprocessor
Commits
4b5d80c1
Commit
4b5d80c1
authored
Jul 06, 2018
by
Houtan Bastani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rework substitution of diff nodes using new node comparison methods
parent
00d276b5
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
145 additions
and
140 deletions
+145
-140
src/DynamicModel.cc
src/DynamicModel.cc
+5
-5
src/DynamicModel.hh
src/DynamicModel.hh
+1
-1
src/ExprNode.cc
src/ExprNode.cc
+113
-110
src/ExprNode.hh
src/ExprNode.hh
+20
-20
src/ModFile.cc
src/ModFile.cc
+1
-1
src/SymbolTable.cc
src/SymbolTable.cc
+4
-2
src/SymbolTable.hh
src/SymbolTable.hh
+1
-1
No files found.
src/DynamicModel.cc
View file @
4b5d80c1
...
...
@@ -5399,7 +5399,7 @@ DynamicModel::substituteUnaryOps(vector<int> &eqnumbers)
}
void
DynamicModel
::
substituteDiff
(
StaticModel
&
static_model
,
ExprNode
::
subst_table_t
&
diff_subst_table
)
DynamicModel
::
substituteDiff
(
ExprNode
::
subst_table_t
&
diff_subst_table
)
{
set
<
int
>
used_local_vars
;
for
(
const
auto
&
equation
:
equations
)
...
...
@@ -5409,21 +5409,21 @@ DynamicModel::substituteDiff(StaticModel &static_model, ExprNode::subst_table_t
diff_table_t
diff_table
;
for
(
auto
&
it
:
local_variables_table
)
if
(
used_local_vars
.
find
(
it
.
first
)
!=
used_local_vars
.
end
())
it
.
second
->
findDiffNodes
(
static_model
,
diff_table
);
it
.
second
->
findDiffNodes
(
diff_table
);
for
(
const
auto
&
equation
:
equations
)
equation
->
findDiffNodes
(
static_model
,
diff_table
);
equation
->
findDiffNodes
(
diff_table
);
// Substitute in model local variables
vector
<
BinaryOpNode
*>
neweqs
;
for
(
auto
&
it
:
local_variables_table
)
it
.
second
=
it
.
second
->
substituteDiff
(
static_model
,
diff_table
,
diff_subst_table
,
neweqs
);
it
.
second
=
it
.
second
->
substituteDiff
(
diff_table
,
diff_subst_table
,
neweqs
);
// Substitute in equations
for
(
auto
&
equation
:
equations
)
{
auto
*
substeq
=
dynamic_cast
<
BinaryOpNode
*>
(
equation
->
substituteDiff
(
static_model
,
diff_table
,
diff_subst_table
,
neweqs
));
substituteDiff
(
diff_table
,
diff_subst_table
,
neweqs
));
assert
(
substeq
!=
nullptr
);
equation
=
substeq
;
}
...
...
src/DynamicModel.hh
View file @
4b5d80c1
...
...
@@ -432,7 +432,7 @@ public:
void
substituteUnaryOps
(
vector
<
int
>
&
eqnumbers
);
//! Substitutes diff operator
void
substituteDiff
(
StaticModel
&
static_model
,
ExprNode
::
subst_table_t
&
diff_subst_table
);
void
substituteDiff
(
ExprNode
::
subst_table_t
&
diff_subst_table
);
//! Table to undiff LHS variables for pac vector z
void
getUndiffLHSForPac
(
vector
<
int
>
&
lhs
,
vector
<
expr_t
>
&
lhs_expr_t
,
vector
<
bool
>
&
diff
,
vector
<
int
>
&
orig_diff_var
,
...
...
src/ExprNode.cc
View file @
4b5d80c1
This diff is collapsed.
Click to expand it.
src/ExprNode.hh
View file @
4b5d80c1
This diff is collapsed.
Click to expand it.
src/ModFile.cc
View file @
4b5d80c1
...
...
@@ -372,7 +372,7 @@ ModFile::transformPass(bool nostrict, bool stochastic, bool compute_xrefs, const
// Create auxiliary variable and equations for Diff operators that appear in VAR equations
ExprNode
::
subst_table_t
diff_subst_table
;
dynamic_model
.
substituteDiff
(
diff_s
tatic_model
,
diff_s
ubst_table
);
dynamic_model
.
substituteDiff
(
diff_subst_table
);
// Var Model
map
<
string
,
vector
<
string
>>
var_model_eq_tags
;
...
...
src/SymbolTable.cc
View file @
4b5d80c1
...
...
@@ -715,12 +715,14 @@ SymbolTable::addExpectationAuxiliaryVar(int information_set, int index, expr_t e
}
int
SymbolTable
::
addDiffLagAuxiliaryVar
(
int
index
,
expr_t
expr_arg
,
int
orig_symb_id
,
int
orig_lag
)
noexcept
(
false
)
SymbolTable
::
addDiffLagAuxiliaryVar
(
int
index
,
expr_t
expr_arg
,
int
lag
,
int
orig_symb_id
,
int
orig_lag
)
noexcept
(
false
)
{
ostringstream
varname
;
int
symb_id
;
varname
<<
"AUX_DIFF_
LAG_"
<<
index
;
varname
<<
"AUX_DIFF_
"
<<
index
<<
"_LAG_"
<<
lag
;
try
{
...
...
src/SymbolTable.hh
View file @
4b5d80c1
...
...
@@ -293,7 +293,7 @@ public:
int
addDiffAuxiliaryVar
(
int
index
,
expr_t
expr_arg
)
noexcept
(
false
);
int
addDiffAuxiliaryVar
(
int
index
,
expr_t
expr_arg
,
int
orig_symb_id
,
int
orig_lag
)
noexcept
(
false
);
//! Takes care of timing between diff statements
int
addDiffLagAuxiliaryVar
(
int
index
,
expr_t
expr_arg
,
int
orig_symb_id
,
int
orig_lag
)
noexcept
(
false
);
int
addDiffLagAuxiliaryVar
(
int
index
,
expr_t
expr_arg
,
int
lag
,
int
orig_symb_id
,
int
orig_lag
)
noexcept
(
false
);
//! An Auxiliary variable for a unary op
int
addUnaryOpAuxiliaryVar
(
int
index
,
expr_t
expr_arg
,
int
orig_symb_id
=
-
1
,
int
orig_lag
=
0
)
noexcept
(
false
);
//! Returns the number of auxiliary variables
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment