diff --git a/doc/macroprocessor/Makefile.am b/doc/macroprocessor/Makefile.am
index dc3f7df0bd3528b436cda8f8a47d3b78cc12446d..5d06b17d7e4d9ff8a80575a540386337d9c14e93 100644
--- a/doc/macroprocessor/Makefile.am
+++ b/doc/macroprocessor/Makefile.am
@@ -4,7 +4,7 @@ pdf-local: macroprocessor.pdf
endif
endif
-SRC = macroprocessor.tex old-design.pdf new-design.pdf
+SRC = macroprocessor.tex new-design.pdf
EXTRA_DIST = $(SRC)
diff --git a/doc/macroprocessor/macroprocessor.tex b/doc/macroprocessor/macroprocessor.tex
index 8d02d99652dff8a4701cdb051b9f2a1e3827b4a9..18e10c8c3a320e17a0adf6b104d3d5ed6e07d215 100644
--- a/doc/macroprocessor/macroprocessor.tex
+++ b/doc/macroprocessor/macroprocessor.tex
@@ -5,10 +5,10 @@
\usetheme{Boadilla}
\title{The Dynare Macro-processor}
-\subtitle{Dynare Summer School 2012}
+\subtitle{Dynare Summer School 2013}
\author{Sébastien Villemot}
\institute{CEPREMAP}
-\date{June 22, 2012}
+\date{June 28, 2013}
\AtBeginSection[]
{
@@ -65,12 +65,7 @@
\end{frame}
\begin{frame}
- \frametitle{Older design of Dynare (version 3)}
- \includegraphics[width=0.95\linewidth]{old-design.pdf}
-\end{frame}
-
-\begin{frame}
- \frametitle{Current design of Dynare (version 4)}
+ \frametitle{Design of Dynare}
\includegraphics[width=0.95\linewidth]{new-design.pdf}
\end{frame}
@@ -85,7 +80,7 @@
\begin{itemize}
\item file inclusion: \verb+@#include+
\item definition a variable of the macro-processor: \verb+@#define+
- \item conditional statements (\verb+@#if/@#ifdef/@#else/@#endif+)
+ \item conditional statements (\verb+@#if/@#ifdef/@#ifndef/@#else/@#endif+)
\item loop statements (\verb+@#for/@#endfor+)
\end{itemize}
\item In most cases, directives occupy exactly one line of text. In case of need, two anti-slashes (\verb+\\+) at the end of the line indicates that the directive is continued on the next line.
@@ -302,6 +297,11 @@ end;
\verb+@#endif+
\end{block}
\end{columns}
+
+\bigskip
+
+There is also \verb+@#ifndef+, which is the opposite of \verb+@#ifdef+
+(\textit{i.e.} it tests whether a variable is \emph{not} defined).
\end{frame}
\begin{frame}[fragile=singleslide]
@@ -578,37 +578,4 @@ rhos = [ 0.8, 0.9, 1];
% \end{itemize}
% \end{frame}
-\section{Dynare for Octave}
-
-\begin{frame}
- \frametitle{Dynare for Octave (1/2)}
- \begin{itemize}
- \item GNU Octave (or simply Octave) is a high-level language, primarily intended for numerical computations
- \item Basically, it is a free clone of MATLAB: same syntax, almost same set of functions
- \item Runs on Windows, GNU/Linux and Mac OS X
- \item Advantages:
- \begin{itemize}
- \item free software, no license fee to pay
- \item source code available
- \item dynamic and responsive community of users and developers
- \end{itemize}
- \item Inconvenients:
- \begin{itemize}
- \item slower than MATLAB
- \item less user friendly (however note that there is a graphical fronted
- called ``qtoctave'' that can be installed on top of Octave; a native
- frontend is under development)
- \end{itemize}
- \end{itemize}
-\end{frame}
-
-\begin{frame}
- \frametitle{Dynare for Octave (2/2)}
- \begin{itemize}
- \item Since version 4.0, Dynare works on top of Octave
- \item This makes Dynare 100\% free software
- \item Almost all features of Dynare work with Octave (very few exceptions)
- \end{itemize}
-\end{frame}
-
\end{document}
diff --git a/doc/macroprocessor/old-design.pdf b/doc/macroprocessor/old-design.pdf
deleted file mode 100644
index 4ccc05c321a1aba52d4b03b0cf095f1e250c038b..0000000000000000000000000000000000000000
Binary files a/doc/macroprocessor/old-design.pdf and /dev/null differ
diff --git a/doc/macroprocessor/old-design.svg b/doc/macroprocessor/old-design.svg
deleted file mode 100644
index 1816925c4e48a948a369f4cba572cd660601f1e9..0000000000000000000000000000000000000000
--- a/doc/macroprocessor/old-design.svg
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="657.71429"
- height="312"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.48.1 r9760"
- version="1.0"
- sodipodi:docname="old-design.pdf"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="/home/sebastien/dynare/unstable/doc/macroprocessor/old-design.pdf.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs4">
- <marker
- inkscape:stockid="Arrow1Lend"
- orient="auto"
- refY="0"
- refX="0"
- id="Arrow1Lend"
- style="overflow:visible">
- <path
- id="path3243"
- d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
- transform="matrix(-0.8,0,0,-0.8,-10,0)" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.7"
- inkscape:cx="555.04474"
- inkscape:cy="220.62111"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="1052.3622px"
- height="744.09448px"
- inkscape:window-width="1024"
- inkscape:window-height="712"
- inkscape:window-x="0"
- inkscape:window-y="25"
- showgrid="false"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-138.99998,-35.951625)">
- <text
- xml:space="preserve"
- style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
- x="60"
- y="72.362183"
- id="text2160"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan2162"
- x="60"
- y="72.362183" /></text>
- <g
- id="g6679"
- transform="translate(-52.857143,-31.428572)">
- <text
- sodipodi:linespacing="125%"
- id="text2164"
- y="125.21933"
- x="251.42856"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
- xml:space="preserve"><tspan
- y="125.21933"
- x="251.42856"
- id="tspan2166"
- sodipodi:role="line">MOD</tspan><tspan
- id="tspan2168"
- y="150.21933"
- x="251.42856"
- sodipodi:role="line">File</tspan></text>
- <path
- transform="matrix(1.0924144,0,0,1.1873521,180.35562,37.324342)"
- d="m 102.85714,79.094482 c 0,18.540989 -16.62942,33.571428 -37.142853,33.571428 -20.513433,0 -37.142857,-15.030439 -37.142857,-33.571428 0,-18.540989 16.629424,-33.57143 37.142857,-33.57143 20.513433,0 37.142853,15.030441 37.142853,33.57143 z"
- sodipodi:ry="33.57143"
- sodipodi:rx="37.142857"
- sodipodi:cy="79.094482"
- sodipodi:cx="65.714287"
- id="path2216"
- style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- sodipodi:type="arc" />
- </g>
- <g
- id="g2239"
- transform="translate(358.57143,25.714291)">
- <text
- sodipodi:linespacing="125%"
- id="text2178"
- y="56.6479"
- x="361.42862"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
- xml:space="preserve"><tspan
- id="tspan2182"
- y="56.6479"
- x="361.42862"
- sodipodi:role="line">Matlab files</tspan><tspan
- id="tspan2188"
- y="81.6479"
- x="361.42862"
- sodipodi:role="line">representing</tspan><tspan
- id="tspan2212"
- y="106.6479"
- x="361.42862"
- sodipodi:role="line">the model</tspan></text>
- <path
- transform="matrix(1.0528522,0,0,1.0682674,-22.862484,-9.0197689)"
- d="m 431.42857,79.808769 c 0,28.403211 -29.74108,51.428571 -66.42857,51.428571 -36.68749,0 -66.42857,-23.02536 -66.42857,-51.428571 0,-28.403215 29.74108,-51.42857 66.42857,-51.42857 36.68749,0 66.42857,23.025355 66.42857,51.42857 z"
- sodipodi:ry="51.42857"
- sodipodi:rx="66.428574"
- sodipodi:cy="79.808769"
- sodipodi:cx="365"
- id="path2218"
- style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- sodipodi:type="arc" />
- </g>
- <g
- id="g2226"
- transform="translate(-498.57142,210)">
- <text
- sodipodi:linespacing="125%"
- id="text2200"
- y="65.21933"
- x="691.42859"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
- xml:space="preserve"><tspan
- y="65.21933"
- x="691.42859"
- id="tspan2202"
- sodipodi:role="line">Output:</tspan><tspan
- id="tspan2206"
- y="90.21933"
- x="691.42859"
- sodipodi:role="line">Results,</tspan><tspan
- id="tspan2210"
- y="115.21933"
- x="691.42859"
- sodipodi:role="line">Graphics</tspan></text>
- <path
- d="m 747.14283,85.523056 c 0,28.403214 -24.30454,51.428574 -54.28571,51.428574 -29.98117,0 -54.28572,-23.02536 -54.28572,-51.428574 0,-28.403215 24.30455,-51.42857 54.28572,-51.42857 29.98117,0 54.28571,23.025355 54.28571,51.42857 z"
- sodipodi:ry="51.42857"
- sodipodi:rx="54.285713"
- sodipodi:cy="85.523056"
- sodipodi:cx="692.85712"
- id="path2220"
- style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- sodipodi:type="arc" />
- </g>
- <g
- id="g5495"
- transform="translate(257.14285,-64.285714)">
- <text
- sodipodi:linespacing="125%"
- id="text2170"
- y="152.36218"
- x="220.00002"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial"
- xml:space="preserve"><tspan
- id="tspan2174"
- y="152.36218"
- x="220.00002"
- sodipodi:role="line">Dynare</tspan><tspan
- y="177.36218"
- x="220.00002"
- sodipodi:role="line"
- id="tspan3023">Preprocessor</tspan></text>
- <rect
- y="101.57445"
- x="137.47997"
- height="126.46864"
- width="163.6115"
- id="rect2222"
- style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.67421651;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- </g>
- <g
- id="g2233"
- transform="translate(194.28571,221.42857)">
- <text
- sodipodi:linespacing="125%"
- id="text2194"
- y="68.076462"
- x="525.71436"
- style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
- xml:space="preserve"><tspan
- y="68.076462"
- x="525.71436"
- id="tspan2196"
- sodipodi:role="line">Dynare</tspan><tspan
- id="tspan2198"
- y="93.076462"
- x="525.71436"
- sodipodi:role="line">Matlab routines</tspan></text>
- <rect
- y="36.951626"
- x="448.57144"
- height="75.714287"
- width="152.85715"
- id="rect2224"
- style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- </g>
- <path
- style="fill:none;stroke:#000000;stroke-width:1.49009621;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend);display:inline"
- d="m 236.63007,99.899587 157.99275,0.412633"
- id="path2258"
- inkscape:connector-type="polyline"
- inkscape:connector-curvature="0" />
- <path
- style="color:#000000;fill:none;stroke:#000000;stroke-width:1.37411284;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Lend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="m 556.05574,101.00285 93.00406,0.65001"
- id="path2260"
- inkscape:connector-type="polyline"
- inkscape:connector-curvature="0" />
- <path
- style="color:#000000;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Lend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="m 719.79923,156.5612 -0.37433,101.819"
- id="path2262"
- inkscape:connector-type="polyline"
- inkscape:connection-start="#g2239"
- inkscape:connection-end="#g2233"
- inkscape:connection-start-point="d4"
- inkscape:connection-end-point="d4"
- inkscape:connector-curvature="0" />
- <path
- style="color:#000000;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Lend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 642.85715,296.13336 248.57136,295.59691"
- id="path2264"
- inkscape:connector-type="polyline"
- inkscape:connection-start="#g2233"
- inkscape:connection-end="#g2226"
- inkscape:connection-start-point="d4"
- inkscape:connection-end-point="d4"
- inkscape:connector-curvature="0" />
- </g>
-</svg>