From c481f3cea3feda567e7e027bbdb5cc9068bd6abe Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Fri, 14 Oct 2016 14:30:14 +0200
Subject: [PATCH] preprocessor: clean up writePowerDeriv code. it only writes C
code, so no need for use_dll argument
---
preprocessor/DataTree.cc | 6 +++---
preprocessor/DataTree.hh | 8 ++++----
preprocessor/DynamicModel.cc | 11 ++++-------
preprocessor/StaticModel.cc | 2 +-
4 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/preprocessor/DataTree.cc b/preprocessor/DataTree.cc
index 7c718c5ec6..ba94916556 100644
--- a/preprocessor/DataTree.cc
+++ b/preprocessor/DataTree.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2015 Dynare Team
+ * Copyright (C) 2003-2016 Dynare Team
*
* This file is part of Dynare.
*
@@ -684,9 +684,9 @@ DataTree::writePowerDerivCHeader(ostream &output) const
}
void
-DataTree::writePowerDeriv(ostream &output, bool use_dll) const
+DataTree::writePowerDeriv(ostream &output) const
{
- if (use_dll && isBinaryOpUsed(oPowerDeriv))
+ if (isBinaryOpUsed(oPowerDeriv))
output << "/*" << endl
<< " * The k-th derivative of x^p" << endl
<< " */" << endl
diff --git a/preprocessor/DataTree.hh b/preprocessor/DataTree.hh
index 4c740113f0..ce908408ac 100644
--- a/preprocessor/DataTree.hh
+++ b/preprocessor/DataTree.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2015 Dynare Team
+ * Copyright (C) 2003-2016 Dynare Team
*
* This file is part of Dynare.
*
@@ -235,10 +235,10 @@ public:
//! Returns the minimum lag (as a negative number) of the given symbol in the whole data tree (and not only in the equations !!)
/*! Returns 0 if the symbol is not used */
int minLagForSymbol(int symb_id) const;
- //! Write the Header for getPowerDeriv when use_dll is used
+ //! Write the C Header for getPowerDeriv when use_dll is used
void writePowerDerivCHeader(ostream &output) const;
- //! Write getPowerDeriv
- void writePowerDeriv(ostream &output, bool use_dll) const;
+ //! Write getPowerDeriv in C
+ void writePowerDeriv(ostream &output) const;
//! Thrown when trying to access an unknown variable by deriv_id
class UnknownDerivIDException
{
diff --git a/preprocessor/DynamicModel.cc b/preprocessor/DynamicModel.cc
index 9b543d4adc..f9720fa1c5 100644
--- a/preprocessor/DynamicModel.cc
+++ b/preprocessor/DynamicModel.cc
@@ -1624,7 +1624,7 @@ DynamicModel::writeDynamicCFile(const string &dynamic_basename, const int order)
// Writing the function body
writeDynamicModel(mDynamicModelFile, true, false);
- writePowerDeriv(mDynamicModelFile, true);
+ writePowerDeriv(mDynamicModelFile);
mDynamicModelFile.close();
mDynamicMexFile.open(filename_mex.c_str(), ios::out | ios::binary);
@@ -4899,7 +4899,7 @@ DynamicModel::writeResidualsC(const string &basename, bool cuda) const
<< model_output.str()
<< "}" << endl;
- writePowerDeriv(mDynamicModelFile, true);
+ writePowerDeriv(mDynamicModelFile);
mDynamicModelFile.close();
}
@@ -4956,8 +4956,6 @@ DynamicModel::writeFirstDerivativesC(const string &basename, bool cuda) const
mDynamicModelFile << "}" << endl;
- // already written in writeResidualsC()
- // writePowerDeriv(mDynamicModelFile, true);
mDynamicModelFile.close();
}
@@ -5060,7 +5058,6 @@ DynamicModel::writeFirstDerivativesC_csr(const string &basename, bool cuda) cons
<< "for (i=0; i < " << row_ptr.size() + 1 << "; i++) row_ptr[i] = row_ptr_data[i];" << endl;
mDynamicModelFile << "}" << endl;
- // writePowerDeriv(mDynamicModelFile, true);
mDynamicModelFile.close();
}
@@ -5153,7 +5150,7 @@ DynamicModel::writeSecondDerivativesC_csr(const string &basename, bool cuda) con
mDynamicModelFile << "}" << endl;
- writePowerDeriv(mDynamicModelFile, true);
+ writePowerDeriv(mDynamicModelFile);
mDynamicModelFile.close();
}
@@ -5279,7 +5276,7 @@ DynamicModel::writeThirdDerivativesC_csr(const string &basename, bool cuda) cons
mDynamicModelFile << "}" << endl;
- writePowerDeriv(mDynamicModelFile, true);
+ writePowerDeriv(mDynamicModelFile);
mDynamicModelFile.close();
}
diff --git a/preprocessor/StaticModel.cc b/preprocessor/StaticModel.cc
index a2af970de0..23e5e1f4d6 100644
--- a/preprocessor/StaticModel.cc
+++ b/preprocessor/StaticModel.cc
@@ -1616,7 +1616,7 @@ StaticModel::writeStaticCFile(const string &func_name) const
writeStaticModel(output, true, false);
output << "}" << endl << endl;
- writePowerDeriv(output, true);
+ writePowerDeriv(output);
output.close();
output.open(filename_mex.c_str(), ios::out | ios::binary);
--
GitLab