Log In | Get Help   
Home My Page Projects Code Snippets Project Openings Mareframe
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files
[mareframe] Diff of /trunk/gadget/ecosystem.h
[mareframe] / trunk / gadget / ecosystem.h Repository:
ViewVC logotype

Diff of /trunk/gadget/ecosystem.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1, Mon Feb 10 17:09:07 2014 UTC revision 16, Tue Oct 13 11:29:01 2015 UTC
# Line 82  Line 82 
82     * \brief This function will read in the optimisation parameters from the input file     * \brief This function will read in the optimisation parameters from the input file
83     * \param infile is the CommentStream to read the optimisation parameters from     * \param infile is the CommentStream to read the optimisation parameters from
84     */     */
85    void readOptimisation(CommentStream& infile);    void readOptimisation(CommentStream& infile, unsigned* seed);
86    /**    /**
87     * \brief This function will write the current model status to file     * \brief This function will write the current model status to file
88     * \param filename is the name of the file to write the model information to     * \param filename is the name of the file to write the model information to
# Line 124  Line 124 
124     * \param Stochastic is the StochasticData containing the new values of the parameters     * \param Stochastic is the StochasticData containing the new values of the parameters
125     */     */
126    void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); };    void Update(const StochasticData* const Stochastic) const { keeper->Update(Stochastic); };
127    #ifdef _OPENMP
128      /**
129       * \brief This function will update the store values of the parameters of the Ecosystems used with OpenMP
130       * \param v is the DoubleVector that store the values of the parameters of the main Ecosystem
131       */
132      void Update(const DoubleVector v)const { keeper->Update(v);}
133    #endif
134    /**    /**
135     * \brief This function will reset the Ecosystem information     * \brief This function will reset the Ecosystem information
136     */     */
# Line 258  Line 265 
265     */     */
266    StockPtrVector& getModelStockVector() { return stockvec; };    StockPtrVector& getModelStockVector() { return stockvec; };
267    /**    /**
268       * \brief This function will return the DoubleVector used to store the values of the parameters
269       * \return values the return of the method getValues from Keeper
270       */
271      DoubleVector getValues() {return keeper->getValues();}
272      /**
273     * \brief This is the flag used to denote whether the user has interrupted the current model run     * \brief This is the flag used to denote whether the user has interrupted the current model run
274     */     */
275    volatile int interrupted;    volatile int interrupted;

Legend:
Removed from v.1  
changed lines
  Added in v.16

root@forge.cesga.es
ViewVC Help
Powered by ViewVC 1.0.0  

Powered By FusionForge