diff --git a/ConfigFile.cc b/ConfigFile.cc
index 0a3ef5eed0faac90b251b12d854b1660ba1bedec..7186adc0dfe986c8de662717e29074cbb2b67838 100644
--- a/ConfigFile.cc
+++ b/ConfigFile.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2013 Dynare Team
+ * Copyright (C) 2010-2015 Dynare Team
*
* This file is part of Dynare.
*
@@ -40,6 +40,16 @@ Hook::Hook(string &global_init_file_arg)
hooks["global_init_file"] = global_init_file_arg;
}
+Path::Path(vector<string> &includepath_arg)
+{
+ if (includepath_arg.empty())
+ {
+ cerr << "ERROR: The Path must have an Include argument." << endl;
+ exit(EXIT_FAILURE);
+ }
+ paths["include"] = includepath_arg;
+}
+
SlaveNode::SlaveNode(string &computerName_arg, string port_arg, int minCpuNbr_arg, int maxCpuNbr_arg, string &userName_arg,
string &password_arg, string &remoteDrive_arg, string &remoteDirectory_arg,
string &dynarePath_arg, string &matlabOctavePath_arg, bool singleCompThread_arg,
@@ -151,6 +161,7 @@ ConfigFile::getConfigFileInfo(const string &config_file)
string name, computerName, port, userName, password, remoteDrive,
remoteDirectory, dynarePath, matlabOctavePath, operatingSystem,
global_init_file;
+ vector<string> includepath;
int minCpuNbr = 0, maxCpuNbr = 0;
bool singleCompThread = true;
member_nodes_t member_nodes;
@@ -158,6 +169,7 @@ ConfigFile::getConfigFileInfo(const string &config_file)
bool inHooks = false;
bool inNode = false;
bool inCluster = false;
+ bool inPaths = false;
while (configFile->good())
{
string line;
@@ -166,11 +178,17 @@ ConfigFile::getConfigFileInfo(const string &config_file)
if (line.empty())
continue;
- if (!line.compare("[node]") || !line.compare("[cluster]") || !line.compare("[hooks]"))
+ if (!line.compare("[node]")
+ || !line.compare("[cluster]")
+ || !line.compare("[hooks]")
+ || !line.compare("[paths]"))
{
if (!global_init_file.empty())
// we were just in [hooks]
addHooksConfFileElement(global_init_file);
+ else if (!includepath.empty())
+ // we were just in [paths]
+ addPathsConfFileElement(includepath);
else
// we were just in [node] or [cluster]
addParallelConfFileElement(inNode, inCluster, member_nodes, name,
@@ -185,24 +203,34 @@ ConfigFile::getConfigFileInfo(const string &config_file)
inHooks = true;
inNode = false;
inCluster = false;
+ inPaths = false;
+ }
+ else if (!line.compare("[node]"))
+ {
+ inHooks = false;
+ inNode = true;
+ inCluster = false;
+ inPaths = false;
+ }
+ else if (!line.compare("[paths]"))
+ {
+ inHooks = false;
+ inNode = false;
+ inCluster = false;
+ inPaths = true;
}
else
- if (!line.compare("[node]"))
- {
- inHooks = false;
- inNode = true;
- inCluster = false;
- }
- else
- {
- inHooks = false;
- inNode = false;
- inCluster = true;
- }
+ {
+ inHooks = false;
+ inNode = false;
+ inCluster = true;
+ inPaths = false;
+ }
name = userName = computerName = port = password = remoteDrive
= remoteDirectory = dynarePath = matlabOctavePath
= operatingSystem = global_init_file = "";
+ includepath.clear();
minCpuNbr = maxCpuNbr = 0;
singleCompThread = true;
member_nodes.clear();
@@ -233,6 +261,30 @@ ConfigFile::getConfigFileInfo(const string &config_file)
cerr << "ERROR: Unrecognized option " << tokenizedLine.front() << " in [hooks] block." << endl;
exit(EXIT_FAILURE);
}
+ else if (inPaths)
+ if (!tokenizedLine.front().compare("Include"))
+ if (includepath.empty())
+ {
+ vector<string> tokenizedPath;
+ split(tokenizedPath, tokenizedLine.back(), is_any_of(":"), token_compress_on);
+ for (vector<string>::iterator it = tokenizedPath.begin();
+ it != tokenizedPath.end(); it++ )
+ if (!it->empty())
+ {
+ trim(*it);
+ includepath.push_back(*it);
+ }
+ }
+ else
+ {
+ cerr << "ERROR: May not have more than one Include option in [paths] block." << endl;
+ exit(EXIT_FAILURE);
+ }
+ else
+ {
+ cerr << "ERROR: Unrecognized option " << tokenizedLine.front() << " in [paths] block." << endl;
+ exit(EXIT_FAILURE);
+ }
else
if (!tokenizedLine.front().compare("Name"))
name = tokenizedLine.back();
@@ -379,12 +431,15 @@ ConfigFile::getConfigFileInfo(const string &config_file)
if (!global_init_file.empty())
addHooksConfFileElement(global_init_file);
+ else if (!includepath.empty())
+ addPathsConfFileElement(includepath);
else
addParallelConfFileElement(inNode, inCluster, member_nodes, name,
computerName, port, minCpuNbr, maxCpuNbr, userName,
password, remoteDrive, remoteDirectory,
dynarePath, matlabOctavePath, singleCompThread,
operatingSystem);
+
configFile->close();
delete configFile;
}
@@ -401,6 +456,18 @@ ConfigFile::addHooksConfFileElement(string &global_init_file)
hooks.push_back(new Hook(global_init_file));
}
+void
+ConfigFile::addPathsConfFileElement(vector<string> &includepath)
+{
+ if (includepath.empty())
+ {
+ cerr << "ERROR: The path to be included must be passed to the Include option." << endl;
+ exit(EXIT_FAILURE);
+ }
+ else
+ paths.push_back(new Path(includepath));
+}
+
void
ConfigFile::addParallelConfFileElement(bool inNode, bool inCluster, member_nodes_t member_nodes,
string &name, string &computerName, string port, int minCpuNbr, int maxCpuNbr, string &userName,
@@ -609,6 +676,20 @@ ConfigFile::transformPass()
it->second /= weight_denominator;
}
+vector<string>
+ConfigFile::getIncludePaths() const
+{
+ vector<string> include_paths;
+ for (vector<Path *>::const_iterator it = paths.begin() ; it != paths.end(); it++)
+ {
+ map <string, vector<string> > pathmap = (*it)->get_paths();
+ for (map <string, vector<string> >::const_iterator mapit = pathmap.begin() ; mapit != pathmap.end(); mapit++)
+ for (vector<string>::const_iterator vecit = mapit->second.begin(); vecit != mapit->second.end(); vecit++)
+ include_paths.push_back(*vecit);
+ }
+ return include_paths;
+}
+
void
ConfigFile::writeHooks(ostream &output) const
{
diff --git a/ConfigFile.hh b/ConfigFile.hh
index c7dd85ef519b0f49bd5d271a209fffa21e6315e6..0a6d2e6c03e6a56f9568ea5b5b977a14ea9a3c53 100644
--- a/ConfigFile.hh
+++ b/ConfigFile.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2012 Dynare Team
+ * Copyright (C) 2010-2015 Dynare Team
*
* This file is part of Dynare.
*
@@ -40,6 +40,17 @@ public:
inline map<string, string>get_hooks() { return hooks; };
};
+class Path
+{
+public:
+ Path(vector<string> &includepath_arg);
+ ~Path();
+private:
+ map<string, vector<string> > paths;
+public:
+ inline map<string, vector<string> >get_paths() { return paths; };
+};
+
class SlaveNode
{
friend class ConfigFile;
@@ -91,12 +102,16 @@ private:
string firstClusterName;
//! Hooks
vector<Hook *> hooks;
+ //! Paths
+ vector<Path *> paths;
//! Cluster Table
map<string, Cluster *> clusters;
//! Node Map
map<string, SlaveNode *> slave_nodes;
//! Add Hooks
void addHooksConfFileElement(string &global_init_file);
+ //! Add Paths
+ void addPathsConfFileElement(vector<string> &includepath);
//! Add a SlaveNode or a Cluster object
void addParallelConfFileElement(bool inNode, bool inCluster, member_nodes_t member_nodes, string &name,
string &computerName, string port, int minCpuNbr, int maxCpuNbr, string &userName,
@@ -110,6 +125,8 @@ public:
void checkPass(WarningConsolidation &warnings) const;
//! Check Pass
void transformPass();
+ //! Get Path Info
+ vector<string> getIncludePaths() const;
//! Write any hooks
void writeHooks(ostream &output) const;
//! Create options_.parallel structure, write options
diff --git a/DynareMain.cc b/DynareMain.cc
index 666e43e96aecf7f62b32b66709893adb798e1013..e1804b334a802382af66f015186ec93105475e4f 100644
--- a/DynareMain.cc
+++ b/DynareMain.cc
@@ -288,6 +288,13 @@ main(int argc, char **argv)
config_file.checkPass(warnings);
config_file.transformPass();
+ // If Include option was passed to the [paths] block of the config file, add
+ // it to paths before macroprocessing
+ vector<string> config_include_paths = config_file.getIncludePaths();
+ for (vector<string>::const_iterator it = config_include_paths.begin();
+ it != config_include_paths.end(); it++)
+ path.push_back(*it);
+
// Do macro processing
MacroDriver m;