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/agebandmatrix.h
[mareframe] / trunk / gadget / agebandmatrix.h Repository:
ViewVC logotype

Diff of /trunk/gadget/agebandmatrix.h

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

revision 1, Mon Feb 10 17:09:07 2014 UTC revision 12, Fri Jul 24 18:36:24 2015 UTC
# Line 5  Line 5 
5  #include "doublematrix.h"  #include "doublematrix.h"
6  #include "popinfomatrix.h"  #include "popinfomatrix.h"
7  #include "popinfoindexvector.h"  #include "popinfoindexvector.h"
8    #include "matrix.h"
9    
10  class Maturity;  class Maturity;
11    
# Line 124  Line 125 
125    void printWeights(ofstream& outfile) const;    void printWeights(ofstream& outfile) const;
126    /**    /**
127     * \brief This function will increase the length and mean weight of the population stored in the vector, according to values calculated by the GrowthCalc calculations for the population     * \brief This function will increase the length and mean weight of the population stored in the vector, according to values calculated by the GrowthCalc calculations for the population
128     * \param Lgrowth is the DoubleMatrix of the calculated change in length due to the growth     * \param Lgrowth is the Matrix of doubles of the calculated change in length due to the growth
129     * \param Wgrowth is the DoubleMatrix of the calculated change in mean weight due to the growth     * \param Wgrowth is the Matrix of doubles of the calculated change in mean weight due to the growth
130     */     */
131    void Grow(const DoubleMatrix& Lgrowth, const DoubleMatrix& Wgrowth);    void Grow(const Matrix& Lgrowth, const Matrix& Wgrowth);
132    //  void Grow(const DoubleMatrix& Lgrowth, const DoubleMatrix& Wgrowth);
133    /**    /**
134     * \brief This function will increase the length and mean weight of the population stored in the vector, according to values calculated by the GrowthCalc and Maturity calculations for the population     * \brief This function will increase the length and mean weight of the population stored in the vector, according to values calculated by the GrowthCalc and Maturity calculations for the population
135     * \param Lgrowth is the DoubleMatrix of the calculated change in length due to the growth     * \param Lgrowth is the DoubleMatrix of the calculated change in length due to the growth
# Line 135  Line 137 
137     * \param Mat is the Maturity used to calculate (and store) the proportion that population that will mature     * \param Mat is the Maturity used to calculate (and store) the proportion that population that will mature
138     * \param area is the identifier for the are used for the maturation process     * \param area is the identifier for the are used for the maturation process
139     */     */
140    void Grow(const DoubleMatrix& Lgrowth, const DoubleMatrix& Wgrowth, Maturity* const Mat, int area);    void Grow(const Matrix& Lgrowth, const Matrix& Wgrowth, Maturity* const Mat, int area);
141    /**    /**
142     * \brief This function will increase the length of the population stored in the vector, according to values calculated by the GrowthCalc calculations for the population     * \brief This function will increase the length of the population stored in the vector, according to values calculated by the GrowthCalc calculations for the population
143     * \param Lgrowth is the DoubleMatrix of the calculated change in length due to the growth     * \param Lgrowth is the DoubleMatrix of the calculated change in length due to the growth
144     * \param Weight is the DoubleVector of the specified mean weight of the population     * \param Weight is the DoubleVector of the specified mean weight of the population
145     * \note The mean weight of the population is fixed to values specified in the input file for the population     * \note The mean weight of the population is fixed to values specified in the input file for the population
146     */     */
147    void Grow(const DoubleMatrix& Lgrowth, const DoubleVector& Weight);    void Grow(const Matrix& Lgrowth, const DoubleVector& Weight);
148    /**    /**
149     * \brief This function will increase the length and mean weight of the population stored in the vector, according to values calculated by the GrowthCalc and Maturity calculations for the population     * \brief This function will increase the length and mean weight of the population stored in the vector, according to values calculated by the GrowthCalc and Maturity calculations for the population
150     * \param Lgrowth is the DoubleMatrix of the calculated change in length due to the growth     * \param Lgrowth is the DoubleMatrix of the calculated change in length due to the growth
# Line 151  Line 153 
153     * \param area is the identifier for the are used for the maturation process     * \param area is the identifier for the are used for the maturation process
154     * \note The mean weight of the population is fixed to values specified in the input file for the population     * \note The mean weight of the population is fixed to values specified in the input file for the population
155     */     */
156    void Grow(const DoubleMatrix& Lgrowth, const DoubleVector& Weight, Maturity* const Mat, int area);    void Grow(const Matrix& Lgrowth, const DoubleVector& Weight, Maturity* const Mat, int area);
157    /**    /**
158     * \brief This function will add a AgeBandMatrix to the current vector     * \brief This function will add a AgeBandMatrix to the current vector
159     * \param Addition is the AgeBandMatrix that will be added to the current vector     * \param Addition is the AgeBandMatrix that will be added to the current vector

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

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

Powered By FusionForge