documentation, whitespace

This commit is contained in:
kuepper 2005-09-27 21:54:05 +00:00
commit 0a57d80b1b
3 changed files with 18 additions and 15 deletions

View file

@ -53,14 +53,10 @@ public:
void printOn(std::ostream& os) const void printOn(std::ostream& os) const
{ {
eoVector<Fit,double>::printOn(os); eoVector<Fit,double>::printOn(os);
os << ' '; os << ' ';
std::copy(stdevs.begin(), stdevs.end(), std::ostream_iterator<double>(os, " ")); std::copy(stdevs.begin(), stdevs.end(), std::ostream_iterator<double>(os, " "));
os << ' '; os << ' ';
std::copy(correlations.begin(), correlations.end(), std::ostream_iterator<double>(os, " ")); std::copy(correlations.begin(), correlations.end(), std::ostream_iterator<double>(os, " "));
os << ' '; os << ' ';
} }

View file

@ -87,8 +87,10 @@ public:
private: private:
// the method to cross slef-adaptation parameters: need to specialize /** Method for cross self-adaptation parameters
Specialization for eoEsSimple.
*/
void cross_self_adapt(eoEsSimple<FitT> & _parent, const eoPop<eoEsSimple<FitT> >& _pop) void cross_self_adapt(eoEsSimple<FitT> & _parent, const eoPop<eoEsSimple<FitT> >& _pop)
{ {
const EOT& realParent1 = sel(_pop); const EOT& realParent1 = sel(_pop);
@ -97,6 +99,10 @@ private:
crossMut(_parent.stdev, realParent2.stdev); // apply eoBinOp crossMut(_parent.stdev, realParent2.stdev); // apply eoBinOp
} }
/** Method for cross self-adaptation parameters
Specialization for eoEsStdev.
*/
void cross_self_adapt(eoEsStdev<FitT> & _parent, const eoPop<eoEsStdev<FitT> >& _pop) void cross_self_adapt(eoEsStdev<FitT> & _parent, const eoPop<eoEsStdev<FitT> >& _pop)
{ {
for (unsigned i=0; i<_parent.size(); i++) for (unsigned i=0; i<_parent.size(); i++)
@ -108,6 +114,10 @@ private:
} }
} }
/** Method for cross self-adaptation parameters
Specialization for eoEsFull.
*/
void cross_self_adapt(eoEsFull<FitT> & _parent, const eoPop<eoEsFull<FitT> >& _pop) void cross_self_adapt(eoEsFull<FitT> & _parent, const eoPop<eoEsFull<FitT> >& _pop)
{ {
unsigned i; unsigned i;

View file

@ -52,10 +52,8 @@ public:
void printOn(std::ostream& os) const void printOn(std::ostream& os) const
{ {
eoVector<Fit,double>::printOn(os); eoVector<Fit,double>::printOn(os);
os << ' '; os << ' ';
std::copy(stdevs.begin(), stdevs.end(), std::ostream_iterator<double>(os, " ")); std::copy(stdevs.begin(), stdevs.end(), std::ostream_iterator<double>(os, " "));
os << ' '; os << ' ';
} }
@ -63,7 +61,6 @@ public:
{ {
eoVector<Fit,double>::readFrom(is); eoVector<Fit,double>::readFrom(is);
stdevs.resize(size()); stdevs.resize(size());
unsigned i; unsigned i;
for (i = 0; i < size(); ++i) for (i = 0; i < size(); ++i)
is >> stdevs[i]; is >> stdevs[i];