Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dynare
preprocessor
Commits
5702815f
Commit
5702815f
authored
Nov 20, 2010
by
Ferhat Mihoubi
Committed by
Sébastien Villemot
Nov 25, 2010
Browse files
Correction of bugs in check command with block decomposition and
Add the missing dr_block m-file
parent
33d340dd
Changes
1
Hide whitespace changes
Inline
Side-by-side
ModelTree.cc
View file @
5702815f
...
...
@@ -633,22 +633,22 @@ ModelTree::computeBlockDecompositionAndFeedbackVariablesForEachBlock(const jacob
for
(
vector
<
int
>::
iterator
its
=
Reordered_Vertice
.
begin
();
its
!=
Reordered_Vertice
.
end
();
its
++
)
{
bool
something_done
=
false
;
if
(
j
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
first
!=
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
second
!=
0
)
if
(
j
==
2
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
first
!=
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
second
!=
0
)
{
n_mixed
[
prologue
+
i
]
++
;
something_done
=
true
;
}
else
if
(
j
==
1
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
first
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
second
!=
0
)
else
if
(
j
==
3
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
first
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
second
!=
0
)
{
n_forward
[
prologue
+
i
]
++
;
something_done
=
true
;
}
else
if
(
j
==
2
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
first
!=
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
second
==
0
)
else
if
(
j
==
1
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
first
!=
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
second
==
0
)
{
n_backward
[
prologue
+
i
]
++
;
something_done
=
true
;
}
else
if
(
j
==
3
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
first
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
second
==
0
)
else
if
(
j
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
first
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
*
its
+
prologue
]].
second
==
0
)
{
n_static
[
prologue
+
i
]
++
;
something_done
=
true
;
...
...
@@ -668,22 +668,22 @@ ModelTree::computeBlockDecompositionAndFeedbackVariablesForEachBlock(const jacob
for
(
set
<
int
>::
iterator
its
=
feed_back_vertices
.
begin
();
its
!=
feed_back_vertices
.
end
();
its
++
)
{
bool
something_done
=
false
;
if
(
j
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
first
!=
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
second
!=
0
)
if
(
j
==
2
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
first
!=
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
second
!=
0
)
{
n_mixed
[
prologue
+
i
]
++
;
something_done
=
true
;
}
else
if
(
j
==
1
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
first
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
second
!=
0
)
else
if
(
j
==
3
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
first
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
second
!=
0
)
{
n_forward
[
prologue
+
i
]
++
;
something_done
=
true
;
}
else
if
(
j
==
2
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
first
!=
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
second
==
0
)
else
if
(
j
==
1
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
first
!=
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
second
==
0
)
{
n_backward
[
prologue
+
i
]
++
;
something_done
=
true
;
}
else
if
(
j
==
3
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
first
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
second
==
0
)
else
if
(
j
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
first
==
0
&&
variable_lag_lead
[
tmp_variable_reordered
[
v_index
[
vertex
(
*
its
,
G
)]
+
prologue
]].
second
==
0
)
{
n_static
[
prologue
+
i
]
++
;
something_done
=
true
;
...
...
Write
Preview
Supports
Markdown
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