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

Made it compile under gcc 3.2.2 by adding explicit definitions

Browse source 
of normally derived comparison operators >, >=, and == for the
structure phenotype.  ( adding #include <utility> was not sufficient
to solve the problem)
Also added function gprop_use_datasets() to give more flexibility
in subclassing the datasets used to train the nets.
This commit is contained in:
stevemadere 2004-01-13 20:21:52 +00:00
commit 4662677a5f
2 changed files with 55 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
eo/app/gprop/gprop.cpp
View file

@ -16,6 +16,7 @@ using namespace std;
//-----------------------------------------------------------------------------
unsigned in, out, hidden;
mlp::set train, validate, test;
//-----------------------------------------------------------------------------
// parameters
@ -77,16 +78,17 @@ void arg(int argc, char** argv)
exit(EXIT_SUCCESS);
}
load_file(trn_set, "trn");
load_file(val_set, "val");
load_file(tst_set, "tst");
load_file(train, "trn");
load_file(validate, "val");
load_file(test, "tst");
phenotype::trn_max = trn_set.size();
phenotype::val_max = val_set.size();
phenotype::tst_max = tst_set.size();
phenotype::trn_max = train.size();
phenotype::val_max = validate.size();
phenotype::tst_max = test.size();
in = trn_set.front().input.size();
out = trn_set.front().output.size();
in = train.front().input.size();
out = train.front().output.size();
gprop_use_datasets(&train, &validate, &test);
hidden = hiddenp.value();
}
@ -133,7 +135,7 @@ void ga()
// stop condition
eoGenContinue<Chrom> continuator1(generations.value());
phenotype p; p.val_ok = val_set.size() - 1; p.mse_error = 0;
phenotype p; p.val_ok = validate.size() - 1; p.mse_error = 0;
eoFitContinue<Chrom> continuator2(p);
eoCombinedContinue<Chrom> continuator(continuator1, continuator2);