nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bug fix

Browse source
This commit is contained in:
gustavoromero 2000-11-24 17:43:02 +00:00
commit 2b8c049283
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
eo/app/gprop/gprop.cc
View file

@ -92,6 +92,10 @@ void arg(int argc, char** argv)
in = trn_set.front().input.size(); in = trn_set.front().input.size();
out = trn_set.front().output.size(); out = trn_set.front().output.size();
hidden = hiddenp.value(); hidden = hiddenp.value();
cout << trn_set << endl;
cout << in << " " << out << " " << hidden << endl;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

11
eo/app/gprop/gprop.h
View file

@ -30,12 +30,11 @@ struct phenotype
static unsigned trn_max, val_max, tst_max; static unsigned trn_max, val_max, tst_max;
operator double(void) const { return val_ok; } // operator double(void) const { return val_ok; }
friend bool operator<(const phenotype& a, const phenotype& b) friend bool operator<(const phenotype& a, const phenotype& b)
{ {
return a.val_ok < b.val_ok || return a.val_ok < b.val_ok; // || (!(a.val_ok < b.val_ok) && a.mse_error < b.mse_error);
(!(a.val_ok < b.val_ok) && a.mse_error < b.mse_error);
} }
friend ostream& operator<<(ostream& os, const phenotype& p) friend ostream& operator<<(ostream& os, const phenotype& p)
@ -48,7 +47,7 @@ struct phenotype
friend istream& operator>>(istream& is, phenotype& p) friend istream& operator>>(istream& is, phenotype& p)
{ {
return is; return is; // complete me
} }
}; };
@ -69,7 +68,7 @@ extern unsigned in, out, hidden;
class Chrom: public EO<phenotype>, public genotype class Chrom: public EO<phenotype>, public genotype
{ {
public: public:
Chrom(): genotype(in, out, vector<unsigned>(1, hidden)) {} Chrom(): genotype(in, out, vector<unsigned>(hidden < 1 ? 0 : 1, hidden)) {}
string className() const { return "Chrom"; } string className() const { return "Chrom"; }
@ -82,7 +81,7 @@ public:
void readFrom (istream& is) void readFrom (istream& is)
{ {
invalidate(); invalidate(); // complete me
} }
}; };