Added symbolic differentiation
This commit is contained in:
parent
3ca7c0f6f4
commit
ffdce66c98
12 changed files with 186 additions and 61 deletions
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
#include <utils/eoRNG.h>
|
||||
|
||||
#include "FunDef.h"
|
||||
#include "sym_compile.h"
|
||||
#include <FunDef.h>
|
||||
#include <sym_compile.h>
|
||||
|
||||
#include "Dataset.h"
|
||||
#include "ErrorMeasure.h"
|
||||
#include "LanguageTable.h"
|
||||
#include "BoundsCheck.h"
|
||||
#include "TreeBuilder.h"
|
||||
#include <Dataset.h>
|
||||
#include <ErrorMeasure.h>
|
||||
#include <LanguageTable.h>
|
||||
#include <BoundsCheck.h>
|
||||
#include <TreeBuilder.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ void test_xover();
|
|||
|
||||
int main() {
|
||||
Dataset dataset;
|
||||
dataset.load_data("problem4.dat");
|
||||
dataset.load_data("test_data.txt");
|
||||
|
||||
cout << "Records/Fields " << dataset.n_records() << ' ' << dataset.n_fields() << endl;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,17 +16,17 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "LanguageTable.h"
|
||||
#include "TreeBuilder.h"
|
||||
#include "FunDef.h"
|
||||
#include "Dataset.h"
|
||||
#include <LanguageTable.h>
|
||||
#include <TreeBuilder.h>
|
||||
#include <FunDef.h>
|
||||
#include <Dataset.h>
|
||||
|
||||
#include "eoSymInit.h"
|
||||
#include "eoSym.h"
|
||||
#include "eoPop.h"
|
||||
#include "eoSymMutate.h"
|
||||
#include "eoSymCrossover.h"
|
||||
#include "eoSymEval.h"
|
||||
#include <eoSymInit.h>
|
||||
#include <eoSym.h>
|
||||
#include <eoPop.h>
|
||||
#include <eoSymMutate.h>
|
||||
#include <eoSymCrossover.h>
|
||||
#include <eoSymEval.h>
|
||||
|
||||
typedef EoSym<double> EoType;
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ int main() {
|
|||
IntervalBoundsCheck check(dataset.input_minima(), dataset.input_maxima());
|
||||
ErrorMeasure measure(dataset, 0.90, ErrorMeasure::mean_squared_scaled);
|
||||
|
||||
eoSymPopEval<EoType> evaluator(check, measure);
|
||||
eoSymPopEval<EoType> evaluator(check, measure, 20000);
|
||||
|
||||
eoPop<EoType> dummy;
|
||||
evaluator(pop, dummy);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue