.gitignore

@@ -60,6 +60,7 @@ checksum
 /doc/dynare.info
 /doc/dynare.info-1
 /doc/dynare.info-2
+/doc/dynare.info-3
 /doc/dynare.cp
 /doc/dynare.fn
 /doc/dynare.fns
@@ -212,3 +213,6 @@ tests/julia/rbc/rbc*.jl
 
 # Octave variables saved when Octave crashes
 octave-workspace
+
+# VERSION generated file
+VERSION
\ No newline at end of file

.gitlab-ci.yml

+variables:
+  GIT_SUBMODULE_STRATEGY: normal
+  TERM: linux
+
+build_binaries:
+  stage: build
+  script:
+    - autoreconf -si
+    - './configure --with-matlab=$(dirname $(dirname $(readlink -f `which matlab`))) MATLAB_VERSION=$(echo version | matlab -nodesktop -nodisplay -nosplash 2>/dev/null | sed -En "/ans\ =/!d;n;n;s/^[^0-9]*([0-9]+\.[0-9]+).*$/\1/;p")'
+    - make -j $(nproc) LN_S="cp -p"
+  artifacts:
+    paths:
+      - matlab/preprocessor*/*
+      - mex/octave/
+      - mex/matlab/
+      - dynare++/src/dynare++
+    expire_in: 1 week
+
+build_doc:
+  stage: build
+  script:
+    - autoreconf -si
+    - ./configure --disable-matlab --disable-octave
+    - make -j $(nproc) info pdf html
+  artifacts:
+    paths:
+      - doc/dynare.info*
+      - doc/dynare.html
+      - doc/dynare.pdf
+
+testsuite_matlab:
+  stage: test
+  script:
+    - autoreconf -si
+    - './configure --disable-octave --with-matlab=$(dirname $(dirname $(readlink -f `which matlab`))) MATLAB_VERSION=$(echo version | matlab -nodesktop -nodisplay -nosplash 2>/dev/null | sed -En "/ans\ =/!d;n;n;s/^[^0-9]*([0-9]+\.[0-9]+).*$/\1/;p")'
+    - make -j $(($(nproc) * 3 / 4)) -C tests check-matlab
+  artifacts:
+    paths:
+      - tests/*.m.log
+      - tests/*.m.trs
+      - tests/*/*.m.log
+      - tests/*/*.m.trs
+      - tests/*/*/*.m.log
+      - tests/*/*/*.m.trs
+      - tests/run_test_matlab_output.txt
+    when: always
+  dependencies:
+    - build_binaries
+
+.testsuite_octave_template:
+  stage: test
+  variables:
+    OPENBLAS_NUM_THREADS: 1
+  script:
+    - autoreconf -si
+    - ./configure --disable-matlab
+    - make -j $(nproc) -C tests check-octave
+  artifacts:
+    paths:
+      - tests/*.o.log
+      - tests/*.o.trs
+      - tests/*/*.o.log
+      - tests/*/*.o.trs
+      - tests/*/*/*.o.log
+      - tests/*/*/*.o.trs
+      - tests/run_test_octave_output.txt
+    when: always
+  dependencies:
+    - build_binaries
+
+testsuite_octave_auto:
+  extends: .testsuite_octave_template
+  only:
+    - tags
+    - schedules
+
+testsuite_octave_manual:
+  extends: .testsuite_octave_template
+  except:
+    - tags
+    - schedules
+  when: manual

.gitmodules

 [submodule "contrib/ms-sbvar/utilities_dw"]
 	path = contrib/ms-sbvar/utilities_dw
-	url = http://www.dynare.org/git/frbatlanta/utilities_dw.git
+	url = https://git.dynare.org/contrib/utilities_dw.git
 [submodule "contrib/ms-sbvar/switch_dw"]
 	path = contrib/ms-sbvar/switch_dw
-	url = http://www.dynare.org/git/frbatlanta/switch_dw.git
+	url = https://git.dynare.org/contrib/switch_dw.git
 [submodule "contrib/ms-sbvar/TZcode"]
 	path = contrib/ms-sbvar/TZcode
-	url = http://www.dynare.org/git/frbatlanta/TZcode.git
-[submodule "contrib/dmm"]
-	path = contrib/dmm
-	url = http://www.dynare.org/git/dmm.git
+	url = https://git.dynare.org/contrib/TZcode.git
 [submodule "matlab/utilities/tests"]
 	path = matlab/utilities/tests
-	url = https://github.com/DynareTeam/m-unit-tests.git
+	url = https://git.dynare.org/Dynare/m-unit-tests.git
 [submodule "matlab/particles"]
 	path = matlab/particles
-	url = https://github.com/DynareTeam/particles.git
+	url = https://git.dynare.org/Dynare/particles.git
 [submodule "matlab/modules/dates"]
 	path = matlab/modules/dates
-	url = https://github.com/DynareTeam/dates.git
+	url = https://git.dynare.org/Dynare/dates.git
 	branch = old-oop-style
 [submodule "matlab/modules/dseries"]
 	path = matlab/modules/dseries
-	url = https://github.com/DynareTeam/dseries.git
+	url = https://git.dynare.org/Dynare/dseries.git
 	branch = old-oop-style
 [submodule "matlab/modules/reporting"]
 	path = matlab/modules/reporting
-	url = https://github.com/DynareTeam/reporting.git
\ No newline at end of file
+	url = https://git.dynare.org/Dynare/reporting.git
\ No newline at end of file

CONTRIBUTING.md

@@ -10,13 +10,13 @@ If something is not clear, don't hesitate to ask if you can't find the answer on
 
 Please note that the repositories under the purview of this page are:
 
-* [Dynare](https://github.com/DynareTeam/dynare)
-* [Particles](https://github.com/DynareTeam/particles)
-* [Dates](https://github.com/DynareTeam/dates)
-* [Dseries](https://github.com/DynareTeam/dseries)
-* [Reporting](https://github.com/DynareTeam/reporting)
-* [Testsuite](https://github.com/DynareTeam/testsuite)
-* [M-unit-tests](https://github.com/DynareTeam/m-unit-tests)
+* [Dynare](https://git.dynare.org/Dynare/dynare)
+* [Particles](https://git.dynare.org/Dynare/particles)
+* [Dates](https://git.dynare.org/Dynare/dates)
+* [Dseries](https://git.dynare.org/Dynare/dseries)
+* [Reporting](https://git.dynare.org/Dynare/reporting)
+* [Testsuite](https://git.dynare.org/Dynare/testsuite)
+* [M-unit-tests](https://git.dynare.org/Dynare/m-unit-tests)
 
 ## Making your Intentions Known
 
@@ -26,7 +26,7 @@ Before making changes to the codebase, it'd be helpful if you communicated your
 
 You can report bugs in both the stable and unstable versions of Dynare. Before reporting a bug in the stable version of Dynare, please check the [Known Bugs](http://www.dynare.org/DynareWiki/KnownBugs) page to ensure it has not already been encountered/fixed. If reporting a bug in the unstable version of Dynare, please ensure the bug exists in the latest [unstable Dynare snapshot](http://www.dynare.org/download/dynare-unstable).
 
-To report a bug in Dynare, simply open a GitHub issue in the repository where the bug resides. For example, to report a bug in Dynare itself, go to the [Dynare repository issue page](https://github.com/DynareTeam/dynare/issues) and click on "New Issue."
+To report a bug in Dynare, simply open a GitHub issue in the repository where the bug resides. For example, to report a bug in Dynare itself, go to the [Dynare repository issue page](https://git.dynare.org/Dynare/dynare/issues) and click on "New Issue."
 
 The minimal information to add is a subject and a description of the steps needed to reproduce the bug. However, the most helpful description would also provide the code to reproduce the bug (often times a `.mod` file). The most helpful `.mod` file is a minimal, quick-running example that reproduces the bug, but we'll take anything that will help us squash a bug.
 
@@ -45,7 +45,7 @@ So, now you've reported the bug or asked for an enhancemnt by creating a GitHub
 Now, if you want to go the extra mile, you'll volunteer to contribute code to fix the GitHub issue you created above. Once we've agreed that you'll do it, please do the following:
 
 1. Clone the Dynare repository:
-   * `git clone https://github.com/DynareTeam/dynare.git`
+   * `git clone https://git.dynare.org/Dynare/dynare.git`
 1. [Fork the Dynare repository](https://help.github.com/articles/fork-a-repo)
 1. Change into the `dynare` folder and add the forked repository as a remote:
    * `cd dynare`

Makefile.am

@@ -39,13 +39,14 @@ dist-hook:
 	rm -rf `find $(distdir)/matlab $(distdir)/examples -name *~`
 	rm -rf $(distdir)/matlab/preprocessor* $(distdir)/matlab/dynare_version.m
 	$(MKDIR_P) $(distdir)/mex/matlab $(distdir)/mex/octave
-	rm -rf `find $(distdir)/contrib -name '.git*'`
+	rm -rf `find $(distdir) -name '.git*'`
 
 install-exec-local:
 	$(MKDIR_P) $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode
 	cp -r contrib/ms-sbvar/TZcode/MatlabFiles $(DESTDIR)$(pkglibdir)/contrib/ms-sbvar/TZcode
 	cp -r examples $(DESTDIR)$(pkglibdir)
 	cp -r matlab $(DESTDIR)$(pkglibdir)
+	find $(DESTDIR)$(pkglibdir) -name LICENSE.md -delete
 	rm -rf $(DESTDIR)$(pkglibdir)/matlab/preprocessor*
 	{ \
 	if [ -z "`file preprocessor/dynare_m | grep x86.64`" ]; then \

README.md

@@ -16,7 +16,7 @@ available via the Dynare homepage: <http://www.dynare.org/download/dynare-stable
 
 # Contributions
 
-To contribute to Dynare and participate in the Dynare community, please see: [CONTRIBUTING.md](https://github.com/DynareTeam/dynare/blob/master/CONTRIBUTING.md)
+To contribute to Dynare and participate in the Dynare community, please see: [CONTRIBUTING.md](https://git.dynare.org/Dynare/dynare/blob/master/CONTRIBUTING.md)
 
 # License
 
@@ -32,7 +32,7 @@ Here, we explain how to build from source:
 - all the associated documentation (PDF and HTML)
 
 This source can be retrieved in three forms:
-- via git, at <https://github.com/DynareTeam/dynare.git>
+- via git, at <https://git.dynare.org/Dynare/dynare.git>
 - using the stable source archive of the latest Dynare version (currently 4.4) from <http://www.dynare.org/download/dynare-stable/>
 - using a source snapshot of the unstable version, from <http://www.dynare.org/download/dynare-unstable/source-snapshot>
 
@@ -81,7 +81,7 @@ A number of tools and libraries are needed in order to recompile everything. You
   - [Beamer](http://latex-beamer.sourceforge.net/) (for some PDF presentations)
 - For building the reference manual:
   - [GNU Texinfo](http://www.gnu.org/software/texinfo/)
-  - [Texi2HTML](http://www.nongnu.org/texi2html) and [Latex2HTML](http://www.latex2html.org), if you want nice mathematical formulas in HTML output
+  - [Latex2HTML](http://www.latex2html.org), if you want nice mathematical formulas in HTML output
   - [Doxygen](http://www.stack.nl/%7Edimitri/doxygen/) (if you want to build Dynare preprocessor source documentation)
 - For Octave, the development libraries corresponding to the UMFPACK packaged with Octave
 
@@ -91,7 +91,7 @@ If you have downloaded the sources from an official source archive or the source
 
 If you want to use Git, do the following from a terminal:
 
-    git clone --recursive http://github.com/DynareTeam/dynare.git
+    git clone --recursive https://git.dynare.org/Dynare/dynare.git
     cd dynare
     autoreconf -si
 
@@ -219,9 +219,9 @@ Alternatively, if you want to build everything, manually install the following p
 
 - `build-essential` (for gcc, g++ and make)
 - `gfortran`
-- `liboctave-dev` or `octave3.2-headers` (will install ATLAS)
+- `liboctave-dev` (or `octave3.2-headers` on older systems)
 - `libboost-graph-dev`
-- `libgsl0-dev`
+- `libgsl-dev` (or `libgsl0-dev` on older systems)
 - `libmatio-dev`
 - `libslicot-dev` and `libslicot-pic`
 - `libsuitesparse-dev`
@@ -235,9 +235,11 @@ Alternatively, if you want to build everything, manually install the following p
 - `texlive-formats-extra` (for Eplain)
 - `texlive-latex-extra` (for fullpage.sty)
 - `texlive-fonts-extra` (for ccicons)
-- `latex-beamer`
+- `texlive-latex-recommended` (or `latex-beamer` on older systems)
+- `texlive-science` (or `texlive-math-extra` on older systems) (for amstex)
 - `texinfo`
-- `texi2html`, `latex2html`
+- `lmodern` (for macroprocessor PDF)
+- `latex2html`
 - `doxygen`
 
 ## Fedora
@@ -253,7 +255,7 @@ Alternatively, if you want to build everything, manually install the following p
 - `automake`
 - `texlive`
 - `texinfo`
-- `texi2html`, `latex2html`
+- `latex2html`
 - `doxygen`
 
 ## Windows
@@ -303,7 +305,7 @@ After this, prepare the source and configure the build tree as described for Lin
 - **NB**: If not compiling Dynare mex files for Octave, add ```--without-octave``` to the installation command
 - **NB**: To compile the latest stable version of dynare, follow the same instructions as above, omitting the ```--HEAD``` argument
 - **NB**: To update a ```--HEAD``` install of dynare you need to uninstall it then install it again: ```brew uninstall dynare; brew install dynare --HEAD```.
-- **NB**: If you want to maintain a separate git directory of dynare, you can do a ```--HEAD``` install of dynare, then uninstall it. This will have the effect of bringing in all the dependencies you will need to then compile dynare from your git directory. Then, change to the git directory and type:
+- **NB**: If you want to maintain a separate git directory of dynare, you can do a ```--HEAD``` install of dynare, then uninstall it. This will have the effect of bringing in all the dependencies you will need to then compile dynare from your git directory. (For `flex` and `bison` it may be necessary to symlink them via `brew link bison --force` and `brew link flex --force` as they are keg-only). Then, change to the git directory and type:
     - ```autoreconf -si; ./configure --with-matlab=/Applications/MATLAB_R2015a.app MATLAB_VERSION=R2015a```, adjusting the Matlab path and version to accord with your version
 - Once compilation is done, open Matlab and type the last line shown when you type ```brew info dynare``` in the Terminal window. With the typical Homebrew setup, this is:
     - ```addpath /usr/local/opt/dynare/lib/dynare/matlab```

VERSION.in

+@PACKAGE_VERSION@
\ No newline at end of file

configure.ac

 dnl Process this file with autoconf to produce a configure script.
 
-dnl Copyright (C) 2009-2016 Dynare Team
+dnl Copyright (C) 2009-2017 Dynare Team
 dnl
 dnl This file is part of Dynare.
 dnl
@@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.62])
-AC_INIT([dynare], [4.5-unstable])
+AC_INIT([dynare], [4.5.7])
 AC_CONFIG_SRCDIR([preprocessor/DynareMain.cc])
 AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability foreign no-dist-gzip dist-xz tar-pax])
 
@@ -86,10 +86,6 @@ CPPFLAGS="$CPPFLAGS_SAVED"
 # Don't use deprecated hash structures
 AC_DEFINE([BOOST_NO_HASH], [], [Don't use deprecated STL hash structures])
 
-# Check for dlopen(), needed by tests for estimation DLL
-AC_CHECK_LIB([dl], [dlopen], [LIBADD_DLOPEN="-ldl"], [])
-AC_SUBST([LIBADD_DLOPEN])
-
 # Check for libmatio, needed by Dynare++
 AX_MATIO
 AM_CONDITIONAL([HAVE_MATIO], [test "x$has_matio" = "xyes"])
@@ -117,9 +113,6 @@ AM_CONDITIONAL([HAVE_PDFLATEX], [test "x$PDFLATEX" != "x"])
 AC_CHECK_PROG([BIBTEX], [bibtex], [bibtex])
 AM_CONDITIONAL([HAVE_BIBTEX], [test "x$BIBTEX" != "x"])
 
-AC_CHECK_PROG([TEXI2HTML], [texi2html], [texi2html])
-AM_CONDITIONAL([HAVE_TEXI2HTML], [test "x$TEXI2HTML" != "x"])
-
 AC_CHECK_PROG([LATEX2HTML], [latex2html], [latex2html])
 AM_CONDITIONAL([HAVE_LATEX2HTML], [test "x$LATEX2HTML" != "x"])
 
@@ -172,6 +165,7 @@ esac
 AX_PTHREAD
 
 AC_CONFIG_FILES([Makefile
+                 VERSION
                  preprocessor/macro/Makefile
                  preprocessor/Makefile
                  doc/Makefile
@@ -202,10 +196,6 @@ AC_CONFIG_FILES([Makefile
                  dynare++/kord/Makefile
                  dynare++/src/Makefile
                  mex/sources/Makefile
-                 mex/sources/estimation/Makefile
-                 mex/sources/estimation/tests/Makefile
-                 mex/sources/estimation/libmat/Makefile
-                 mex/sources/estimation/libmat/tests/Makefile
 ])
 
 AC_ARG_ENABLE([matlab], AS_HELP_STRING([--disable-matlab], [disable compilation of MEX files for MATLAB]), [], [enable_matlab=yes])
@@ -281,10 +271,10 @@ fi
 
 if test "x$MAKEINFO" != "x"; then
   BUILD_DYNARE_INFO="yes"
-  if test "x$TEXI2HTML" != "x" -a "x$LATEX2HTML" != "x"; then
+  if test "x$LATEX2HTML" != "x"; then
     BUILD_DYNARE_HTML_MANUAL="yes"
   else
-    BUILD_DYNARE_HTML_MANUAL="yes (but with ugly math formulas, missing texi2html or latex2html)"
+    BUILD_DYNARE_HTML_MANUAL="yes (but with ugly math formulas, missing latex2html)"
   fi
   BUILD_DYNARE_PDF_MANUAL="yes"
 else

dmm @ ea7846fd

-Subproject commit ea7846fd71d32851877cf60008ac5046b51a7a51

switch_dw @ ce173d3f

-Subproject commit 8b3d14040133ea5b622cde9ea79b3b0b41891bce
+Subproject commit ce173d3fa2605957f7208bf624655893a7dc1768

doc/Makefile.am

@@ -2,15 +2,14 @@ SUBDIRS = preprocessor macroprocessor userguide parallel internals gsa dseries-a
 
 info_TEXINFOS = dynare.texi
 
-if HAVE_TEXI2HTML
 if HAVE_LATEX2HTML
 html-local: dynare.html
 
+# The temporary directory for latex2html (L2H_TMP) must not contain a dot, so
+# enforce standard tmp directory instead of defaulting to current directory
 dynare.html: dynare.texi
 	rm -rf dynare.html
-	mkdir -p dynare.html
-	cd dynare.html && $(TEXI2HTML) --l2h --split section --prefix index ../dynare.texi
-endif
+	texi2any --html --split=section -c L2H=1 -c L2H_TMP=$${TMPDIR:-/tmp} -c PREFIX=dynare.html dynare.texi
 endif
 
 PDF_TARGETS =

doc/macroprocessor/macroprocessor.tex

@@ -8,12 +8,11 @@
 \usetheme{Boadilla}
 
 \title{The Dynare Macro-processor}
-\subtitle{Dynare Summer School 2015}
+\subtitle{Dynare Summer School 2017}
 \author{Sébastien Villemot}
 %\pgfdeclareimage[height=0.6cm]{logo}{logo-ofce}
-%\institute[OFCE]{\pgfuseimage{logo}}
 \institute{OFCE}
-\date{June 9, 2015}
+\date{June 13, 2017}
 
 \AtBeginSection[]
 {
@@ -91,30 +90,6 @@
   \end{itemize}
 \end{frame}
 
-\begin{frame}[fragile=singleslide]
-  \frametitle{Inclusion directive}
-  \begin{itemize}
-  \item This directive simply includes the content of another file at the place where it is inserted.
-    \begin{block}{Syntax}
-      \verb+@#include "+\textit{filename}\verb+"+
-    \end{block}
-    \begin{block}{Example}
-\begin{verbatim}
-@#include "modelcomponent.mod"
-\end{verbatim}
-    \end{block}
-  \item Exactly equivalent to a copy/paste of the content of the included file
-  \item Note that it is possible to nest includes (\textit{i.e.} to include a file from an included file)
-  \item Since Dynare 4.5, the filename can be given by a macro-variable (see below).
-    Useful in loops.
-    \begin{block}{Example with variable}
-\begin{verbatim}
-@#define fname = "modelcomponent.mod"
-@#include fname
-\end{verbatim}
-    \end{block}
-  \end{itemize}
-\end{frame}
 
 \begin{frame}
 \frametitle{Variables}
@@ -219,6 +194,41 @@ end;
   \end{block}
 \end{frame}
 
+\begin{frame}[fragile=singleslide]
+  \frametitle{Inclusion directive (1/2)}
+  \begin{itemize}
+  \item This directive simply includes the content of another file at the place where it is inserted.
+    \begin{block}{Syntax}
+      \verb+@#include "+\textit{filename}\verb+"+
+    \end{block}
+    \begin{block}{Example}
+\begin{verbatim}
+@#include "modelcomponent.mod"
+\end{verbatim}
+    \end{block}
+  \item Exactly equivalent to a copy/paste of the content of the included file
+  \item Note that it is possible to nest includes (\textit{i.e.} to include a
+    file from an included file)
+  \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile=singleslide]
+  \frametitle{Inclusion directive (2/2)}
+  \begin{itemize}
+\item The filename can be given by a macro-variable (useful in loops):
+    \begin{block}{Example with variable}
+\begin{verbatim}
+@#define fname = "modelcomponent.mod"
+@#include fname
+\end{verbatim}
+    \end{block}
+  \item Files to include are searched for in current directory. Other directories can
+    be added with
+    \texttt{@includepath} directive, \texttt{-I} command line option or
+    \texttt{[paths]} section in config file.
+  \end{itemize}
+\end{frame}
+
 \begin{frame}[fragile=singleslide]
   \frametitle{Loop directive}
   \begin{block}{Syntax}
@@ -604,7 +614,7 @@ rhos = [ 0.8, 0.9, 1];
     \ccbysa
     \column{0.71\textwidth}
     \tiny
-    Copyright © 2008--2015 Dynare Team \\
+    Copyright © 2008--2017 Dynare Team \\
     Licence: \href{http://creativecommons.org/licenses/by-sa/4.0/}{Creative
       Commons Attribution-ShareAlike 4.0}
     \end{columns}

doc/parallel/parallel.tex

@@ -2,6 +2,7 @@
 % AMS-LaTeX Paper ************************************************
 % **** -----------------------------------------------------------
 \documentclass[12pt,a4paper,pdftex,nofootinbib]{article}
+\usepackage[cp1252]{inputenc}
 \usepackage{amssymb,amsmath}
 \usepackage[pdftex]{graphicx}
 \usepackage{epstopdf}

dynare++/kord/decision_rule.cweb

@@ -100,6 +100,7 @@ SimResults::~SimResults()
 	for (int i = 0; i < getNumSets(); i++) {
 		delete data[i];
 		delete shocks[i];
+		delete start[i];
 	}
 }
 
@@ -149,7 +150,7 @@ which are not to be burnt. If the data is not finite, the both data
 and shocks are thrown away.
 
 @<|SimResults::addDataSet| code@>=
-bool SimResults::addDataSet(TwoDMatrix* d, ExplicitShockRealization* sr)
+bool SimResults::addDataSet(TwoDMatrix* d, ExplicitShockRealization* sr, const ConstVector& st)
 {
 	KORD_RAISE_IF(d->nrows() != num_y,
 				  "Incompatible number of rows for SimResults::addDataSets");
@@ -160,6 +161,10 @@ bool SimResults::addDataSet(TwoDMatrix* d, ExplicitShockRealization* sr)
 		data.push_back(new TwoDMatrix((const TwoDMatrix&)(*d),num_burn,num_per));
 		shocks.push_back(new ExplicitShockRealization(
 								ConstTwoDMatrix(sr->getShocks(),num_burn,num_per)));
+		if (num_burn == 0)
+			start.push_back(new Vector(st));
+		else
+			start.push_back(new Vector(ConstVector(*d, num_burn-1)));
 		ret = true;
 	}
 
@@ -527,7 +532,7 @@ void SimulationWorker::operator()()
 	TwoDMatrix* m = dr.simulate(em, np, st, *esr);
 	{
 		SYNCHRO syn(&res, "simulation");
-		res.addDataSet(m, esr);
+		res.addDataSet(m, esr, st);
 	}
 }
 
@@ -540,13 +545,11 @@ void SimulationIRFWorker::operator()()
 	ExplicitShockRealization* esr =
 	    new ExplicitShockRealization(res.control.getShocks(idata));
 	esr->addToShock(ishock, 0, imp);
-	const TwoDMatrix& data = res.control.getData(idata);
-	ConstVector st(data, res.control.getNumBurn());
-	TwoDMatrix* m = dr.simulate(em, np, st, *esr);
+	TwoDMatrix* m = dr.simulate(em, np, res.control.getStart(idata), *esr);
 	m->add(-1.0, res.control.getData(idata));
 	{
 		SYNCHRO syn(&res, "simulation");
-		res.addDataSet(m, esr);
+		res.addDataSet(m, esr, res.control.getStart(idata));
 	}
 }
 

dynare++/kord/decision_rule.hweb

@@ -694,7 +694,8 @@ bool calcFixPoint(emethod em, Vector& out)
 
 @ This is a basically a number of matrices of the same dimensions,
 which can be obtained as simulation results from a given decision rule
-and shock realizations. We also store the realizations of shocks.
+ and shock realizations. We also store the realizations of shocks and the
+starting point of each simulation.
 
 @<|SimResults| class declaration@>=
 class ExplicitShockRealization;
@@ -705,6 +706,7 @@ protected:@;
 	int num_burn;
 	vector<TwoDMatrix*> data;
 	vector<ExplicitShockRealization*> shocks;
+	vector<Vector *> start;
 public:@;
 	SimResults(int ny, int nper, int nburn = 0)
 		: num_y(ny), num_per(nper), num_burn(nburn)@+ {}
@@ -723,7 +725,9 @@ public:@;
 		{@+ return *(data[i]);@+}
 	const ExplicitShockRealization& getShocks(int i) const
 		{ @+ return *(shocks[i]);@+}
-	bool addDataSet(TwoDMatrix* d, ExplicitShockRealization* sr);
+	const Vector& getStart(int i) const
+		{ return *(start[i]); }
+	bool addDataSet(TwoDMatrix* d, ExplicitShockRealization* sr, const ConstVector& st);
 	void writeMat(const char* base, const char* lname) const;
 	void writeMat(mat_t* fd, const char* lname) const;
 };

dynare++/kord/first_order.cweb

@@ -22,7 +22,7 @@ to select (return true) the pairs for which $\alpha<\beta$.
 @<|order_eigs| function code@>=
 lapack_int order_eigs(const double* alphar, const double* alphai, const double* beta)
 {
-	return (*alphar * *alphar + *alphai * *alphai < *beta * *beta * qz_criterium);
+	return (*alphar * *alphar + *alphai * *alphai < *beta * *beta * qz_criterium * qz_criterium);
 }
 
 

dynare++/kord/journal.cweb

@@ -101,7 +101,11 @@ void SystemResources::getRUS(double& load_avg, long int& pg_avail,
 	majflt = -1;
 #endif
 
-#if !defined(__MINGW32__) && !defined(__CYGWIN32__) && !defined(__CYGWIN__) && !defined(__MINGW64__) && !defined(__CYGWIN64__)
+
+#define MINGCYGTMP (!defined(__MINGW32__) && !defined(__CYGWIN32__) && !defined(__CYGWIN__))
+#define MINGCYG (MINGCYGTMP && !defined(__MINGW64__) && !defined(__CYGWIN64__))
+
+#if MINGCYG
 	getloadavg(&load_avg, 1);
 #else
 	load_avg = -1.0;

dynare++/kord/korder.cweb

@@ -159,9 +159,9 @@ KOrder::KOrder(int num_stat, int num_pred, int num_both, int num_forw,
 	KORD_RAISE_IF(gy.nrows() != ypart.ny(),
 				  "Wrong number of rows in gy in KOrder constructor");
 	KORD_RAISE_IF(gu.nrows() != ypart.ny(),
-				  "Wrong number of rows in gu in KOrder constuctor");
+				  "Wrong number of rows in gu in KOrder constructor");
 	KORD_RAISE_IF(gu.ncols() != nu,
-				  "Wrong number of columns in gu in KOrder constuctor");
+				  "Wrong number of columns in gu in KOrder constructor");
 
 	// set nvs:
 	nvs[0] = ypart.nys(); nvs[1] = nu; nvs[2] = nu; nvs[3] = 1;