From b88c5abcbabf4df603841f0795ab2b837dc1590c Mon Sep 17 00:00:00 2001
From: sebastien <sebastien@ac1d8469-bf42-47a9-8791-bf33cf982152>
Date: Thu, 3 Sep 2009 09:57:17 +0000
Subject: [PATCH] Remove useless "markowitz" data member in DynamicModel and
StaticDllModel
git-svn-id: https://www.dynare.org/svn/dynare/trunk@2886 ac1d8469-bf42-47a9-8791-bf33cf982152
---
preprocessor/DynamicModel.cc | 1 -
preprocessor/DynamicModel.hh | 2 --
preprocessor/StaticDllModel.cc | 1 -
preprocessor/StaticDllModel.hh | 2 --
tests/ramst.mod | 6 +++---
5 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/preprocessor/DynamicModel.cc b/preprocessor/DynamicModel.cc
index 8fca4269be..78be858b09 100644
--- a/preprocessor/DynamicModel.cc
+++ b/preprocessor/DynamicModel.cc
@@ -43,7 +43,6 @@ DynamicModel::DynamicModel(SymbolTable &symbol_table_arg,
max_exo_det_lag(0), max_exo_det_lead(0),
dynJacobianColsNbr(0),
cutoff(1e-15),
- markowitz(0.7),
mfs(0),
block_triangular(symbol_table_arg, num_constants_arg)
{
diff --git a/preprocessor/DynamicModel.hh b/preprocessor/DynamicModel.hh
index 9ddbada8ce..f1b5dbfc5c 100644
--- a/preprocessor/DynamicModel.hh
+++ b/preprocessor/DynamicModel.hh
@@ -143,8 +143,6 @@ public:
virtual NodeID AddVariable(const string &name, int lag = 0);
//! Absolute value under which a number is considered to be zero
double cutoff;
- //! The weight of the Markowitz criteria to determine the pivot in the linear solver (simul_NG1 and simul_NG from bytecode.cc)
- double markowitz;
//! Compute the minimum feedback set in the dynamic model:
/*! 0 : all endogenous variables are considered as feedback variables
1 : the variables belonging to non normalized equation are considered as feedback variables
diff --git a/preprocessor/StaticDllModel.cc b/preprocessor/StaticDllModel.cc
index e7ad4238aa..73cb0861d4 100644
--- a/preprocessor/StaticDllModel.cc
+++ b/preprocessor/StaticDllModel.cc
@@ -43,7 +43,6 @@ StaticDllModel::StaticDllModel(SymbolTable &symbol_table_arg,
max_exo_det_lag(0), max_exo_det_lead(0),
dynJacobianColsNbr(0),
cutoff(1e-15),
- markowitz(0.7),
mfs(0),
block_triangular(symbol_table_arg, num_constants_arg)
{
diff --git a/preprocessor/StaticDllModel.hh b/preprocessor/StaticDllModel.hh
index ab7007306f..465292e6af 100644
--- a/preprocessor/StaticDllModel.hh
+++ b/preprocessor/StaticDllModel.hh
@@ -135,8 +135,6 @@ public:
virtual NodeID AddVariable(const string &name, int lag = 0);
//! Absolute value under which a number is considered to be zero
double cutoff;
- //! The weight of the Markowitz criteria to determine the pivot in the linear solver (simul_NG1 and simul_NG from simulate.cc)
- double markowitz;
//! Compute the minimum feedback set in the static model:
/*! 0 : all endogenous variables are considered as feedback variables
1 : the variables belonging to a non linear equation are considered as feedback variables
diff --git a/tests/ramst.mod b/tests/ramst.mod
index 9fa14019de..c1cc7a1489 100644
--- a/tests/ramst.mod
+++ b/tests/ramst.mod
@@ -10,7 +10,7 @@ aa=0.5;
model;
-c + k - aa*x*k(-1)^alph - (1-delt)*k(-1);
+[ yo = 'plouf', onx = 'inx' ] c + k - aa*x*k(-1)^alph - (1-delt)*k(-1);
c^(-gam) - (1+bet)^(-1)*(aa*alph*x(+1)*k^(alph-1) + 1 - delt)*c(+1)^(-gam);
end;
@@ -20,9 +20,9 @@ k = ((delt+bet)/(1.0*aa*alph))^(1/(alph-1));
c = aa*k^alph-delt*k;
end;
-steady;
+steady(solve_algo=2);
-check;
+//check;
shocks;
var x;
--
GitLab