Commit 7c2de197 authored by Stéphane Adjemian (Charybdis)'s avatar Stéphane Adjemian (Charybdis)
Browse files

Merge remote branch 'origin/master'

parents ccf778e6 3459e1ff
......@@ -15,7 +15,7 @@
;; GNU General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, see
;; along with this program. If not, see
;; <http://www.gnu.org/licenses/>.
;; Keywords: dynare
......
......@@ -320,5 +320,22 @@ License: GPL-3+
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, see
along with this program. If not, see
<http://www.gnu.org/licenses/>.
Files: mex/sources/libslicot/*
Copyright: 2002-2009, NICONET e.V.
License: GPL-2+
This program is free software: you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 2 of
the License, or (at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see
<http://www.gnu.org/licenses/>.
......@@ -5,7 +5,7 @@ CPPFLAGS += -I$(top_srcdir)/../../sources
DEFS += -DOCTAVE_MEX_FILE
CFLAGS += $(shell $(MKOCTFILE) -p CPICFLAG)
FFLAGS += $(shell $(MKOCTFILE) -p FPICFLAG)
CXXFLAGS += $(shell $(MKOCTFILE) -p CXXPICFLAG)
LDFLAGS += $(shell $(MKOCTFILE) -p DL_LDFLAGS)
......
......@@ -3111,10 +3111,14 @@ DynamicModel::computeDerivIDs()
int lag = it->second;
SymbolType type = symbol_table.getType(it->first);
// Setting maximum and minimum lags
if (max_lead < lag)
/* Setting maximum and minimum lags.
We don't want these to be affected by lead/lags on parameters: they
are accepted for facilitating variable flipping, but are simply
ignored. */
if (max_lead < lag && type != eParameter)
max_lead = lag;
else if (-max_lag > lag)
else if (-max_lag > lag && type != eParameter)
max_lag = -lag;
switch (type)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment