# | Line 9 | Line 9 | |
---|---|---|
9 | #include "parse_me.h" | |
10 | #include "Integrator.hpp" | |
11 | #include "simError.h" | |
12 | + | #include "ConjugateMinimizer.hpp" |
13 | ||
14 | #ifdef IS_MPI | |
15 | #include "mpiBASS.h" | |
# | Line 145 | Line 146 | void SimSetup::createSim(void){ | |
146 | ||
147 | makeOutNames(); | |
148 | ||
149 | < | // make the integrator |
150 | < | |
151 | < | makeIntegrator(); |
152 | < | |
149 | > | if (globals->haveMinimizer()) |
150 | > | // make minimizer |
151 | > | makeMinimizer(); |
152 | > | else |
153 | > | // make the integrator |
154 | > | makeIntegrator(); |
155 | > | |
156 | #ifdef IS_MPI | |
157 | mpiSim->mpiRefresh(); | |
158 | #endif | |
# | Line 841 | Line 845 | void SimSetup::gatherInfo(void){ | |
845 | for (int i = 0; i < nInfo; i++){ | |
846 | info[i].setSeed(seedValue); | |
847 | } | |
848 | < | |
848 | > | |
849 | #ifdef IS_MPI | |
850 | strcpy(checkPointMsg, "Successfully gathered all information from Bass\n"); | |
851 | MPIcheckPoint(); | |
# | Line 1706 | Line 1710 | void SimSetup::setupZConstraint(SimInfo& theInfo){ | |
1710 | //push data into siminfo, therefore, we can retrieve later | |
1711 | theInfo.addProperty(zconsParaData); | |
1712 | } | |
1713 | + | |
1714 | + | void SimSetup::makeMinimizer(){ |
1715 | + | |
1716 | + | OOPSEMinimizerBase* myOOPSEMinimizerBase; |
1717 | + | ObjFunctor1 * objFunc; |
1718 | + | OutputFunctor* outputFunc; |
1719 | + | ConcreteNLModel1* nlp; |
1720 | + | MinimizerParameterSet* param; |
1721 | + | ConjugateMinimizerBase* minimizer; |
1722 | + | int dim; |
1723 | + | |
1724 | + | for (int i = 0; i < nInfo; i++){ |
1725 | + | //creat |
1726 | + | myOOPSEMinimizerBase = new OOPSEMinimizerBase(&(info[i]), the_ff); |
1727 | + | |
1728 | + | info[i].the_integrator = myOOPSEMinimizerBase; |
1729 | + | //creat the object functor; |
1730 | + | objFunc = (ObjFunctor1*) new ClassMemObjFunctor1<OOPSEMinimizerBase> |
1731 | + | (myOOPSEMinimizerBase, &OOPSEMinimizerBase::calcGradient); |
1732 | + | |
1733 | + | //creat output functor; |
1734 | + | outputFunc = new ClassMemOutputFunctor<OOPSEMinimizerBase> |
1735 | + | (myOOPSEMinimizerBase, &OOPSEMinimizerBase::output); |
1736 | + | |
1737 | + | //creat nonlinear model |
1738 | + | dim = myOOPSEMinimizerBase->getDim(); |
1739 | + | nlp = new ConcreteNLModel1(dim, objFunc); |
1740 | + | |
1741 | + | nlp->setX(myOOPSEMinimizerBase->getCoor()); |
1742 | + | |
1743 | + | //prepare parameter set for minimizer |
1744 | + | param = new MinimizerParameterSet(); |
1745 | + | param->setDefaultParameter(); |
1746 | + | |
1747 | + | if (globals->haveMinimizer()){ |
1748 | + | param->setFTol(globals->getMinFTol()); |
1749 | + | } |
1750 | + | |
1751 | + | if (globals->haveMinGTol()){ |
1752 | + | param->setGTol(globals->getMinGTol()); |
1753 | + | } |
1754 | + | |
1755 | + | if (globals->haveMinMaxIter()){ |
1756 | + | param->setMaxIteration(globals->getMinMaxIter()); |
1757 | + | } |
1758 | + | |
1759 | + | if (globals->haveMinWriteFrq()){ |
1760 | + | param->setMaxIteration(globals->getMinMaxIter()); |
1761 | + | } |
1762 | + | |
1763 | + | if (globals->haveMinWriteFrq()){ |
1764 | + | param->setWriteFrq(globals->getMinWriteFrq()); |
1765 | + | } |
1766 | + | |
1767 | + | if (globals->haveMinResetFrq()){ |
1768 | + | param->setResetFrq(globals->getMinResetFrq()); |
1769 | + | } |
1770 | + | |
1771 | + | if (globals->haveMinLSMaxIter()){ |
1772 | + | param->setLineSearchMaxIteration(globals->getMinLSMaxIter()); |
1773 | + | } |
1774 | + | |
1775 | + | if (globals->haveMinLSTol()){ |
1776 | + | param->setLineSearchTol(globals->getMinLSTol()); |
1777 | + | } |
1778 | + | |
1779 | + | //creat the minimizer |
1780 | + | minimizer = new PRCGMinimizer(nlp, param); |
1781 | + | minimizer->setLineSearchStrategy(nlp, GoldenSection); |
1782 | + | minimizer->setOutputFunctor(outputFunc); |
1783 | + | |
1784 | + | //store the minimizer into simInfo |
1785 | + | info[i].the_minimizer = minimizer; |
1786 | + | info[i].has_minimizer = true; |
1787 | + | } |
1788 | + | |
1789 | + | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |