From fe1af9d985cf29d0ad34af2190e2ec8941cd3a6b Mon Sep 17 00:00:00 2001
From: Ferhat Mihoubi <ferhat.mihoubi@univ-evry.fr>
Date: Wed, 12 Oct 2011 14:58:29 +0200
Subject: [PATCH] The recursive equations are merged in a recursive block only
if they are all backward looking or all forward looking but not both
---
preprocessor/ModelTree.cc | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/preprocessor/ModelTree.cc b/preprocessor/ModelTree.cc
index 807d062390..baf39213e0 100644
--- a/preprocessor/ModelTree.cc
+++ b/preprocessor/ModelTree.cc
@@ -848,13 +848,27 @@ ModelTree::reduceBlocksAndTypeDetermination(const dynamic_jacob_map_t &dynamic_j
}
if (i > 0)
{
- if ((prev_Type == EVALUATE_FORWARD && Simulation_Type == EVALUATE_FORWARD)
- || (prev_Type == EVALUATE_BACKWARD && Simulation_Type == EVALUATE_BACKWARD))
+ bool is_lead = false, is_lag = false;
+ int c_Size = (block_type_size_mfs[block_type_size_mfs.size()-1]).second.first;
+ int first_equation = (block_type_size_mfs[block_type_size_mfs.size()-1]).first.second;
+ if (c_Size > 0 && ((prev_Type == EVALUATE_FORWARD && Simulation_Type == EVALUATE_FORWARD && !is_lead)
+ || (prev_Type == EVALUATE_BACKWARD && Simulation_Type == EVALUATE_BACKWARD && !is_lag)))
+ {
+ for (int j = first_equation; j < first_equation+c_Size; j++)
+ {
+ dynamic_jacob_map_t::const_iterator it = dynamic_jacobian.find(make_pair(-1, make_pair(equation_reordered[eq], variable_reordered[j])));
+ if (it != dynamic_jacobian.end())
+ is_lag = true;
+ it = dynamic_jacobian.find(make_pair(+1, make_pair(equation_reordered[eq], variable_reordered[j])));
+ if (it != dynamic_jacobian.end())
+ is_lead = true;
+ }
+ }
+ if ((prev_Type == EVALUATE_FORWARD && Simulation_Type == EVALUATE_FORWARD && !is_lead)
+ || (prev_Type == EVALUATE_BACKWARD && Simulation_Type == EVALUATE_BACKWARD && !is_lag))
{
//merge the current block with the previous one
BlockSimulationType c_Type = (block_type_size_mfs[block_type_size_mfs.size()-1]).first.first;
- int c_Size = (block_type_size_mfs[block_type_size_mfs.size()-1]).second.first;
- int first_equation = (block_type_size_mfs[block_type_size_mfs.size()-1]).first.second;
c_Size++;
block_type_size_mfs[block_type_size_mfs.size()-1] = make_pair(make_pair(c_Type, first_equation), make_pair(c_Size, c_Size));
if (block_lag_lead[block_type_size_mfs.size()-1].first > Lag)
--
GitLab