diff options
Diffstat (limited to 'src/engine/Evolver.cpp')
| -rw-r--r-- | src/engine/Evolver.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/engine/Evolver.cpp b/src/engine/Evolver.cpp index a71d64b..56b3b45 100644 --- a/src/engine/Evolver.cpp +++ b/src/engine/Evolver.cpp @@ -32,12 +32,13 @@ using namespace boost; namespace Machina { -Evolver::Evolver(TimeUnit unit, const string& target_midi, - SharedPtr<Machine> seed) +Evolver::Evolver(TimeUnit unit, + const string& target_midi, + SPtr<Machine> seed) : _problem(new Problem(unit, target_midi, seed)) , _seed_fitness(-FLT_MAX) { - SharedPtr<Eugene::HybridMutation<Machine> > m(new HybridMutation<Machine>()); + SPtr<Eugene::HybridMutation<Machine> > m(new HybridMutation<Machine>()); m->append_mutation(1 / 6.0f, boost::shared_ptr< Eugene::Mutation<Machine> >( new Mutation::Compress())); @@ -59,14 +60,14 @@ Evolver::Evolver(TimeUnit unit, const string& target_midi, boost::shared_ptr< Selection<Machine> > s(new TournamentSelection<Machine>( _problem, 3, 0.8)); boost::shared_ptr< Crossover<Machine> > crossover; - _ga = SharedPtr<MachinaGA>(new MachinaGA(_problem, s, crossover, m, - 20, 20, 2, 1.0, 0.0)); + _ga = SPtr<MachinaGA>( + new MachinaGA(_problem, s, crossover, m, 20, 20, 2, 1.0, 0.0)); } void -Evolver::seed(SharedPtr<Machine> parent) +Evolver::seed(SPtr<Machine> parent) { - /*_best = SharedPtr<Machine>(new Machine(*parent.get())); + /*_best = SPtr<Machine>(new Machine(*parent.get())); _best_fitness = _problem->fitness(*_best.get());*/ _problem->seed(parent); _seed_fitness = _problem->fitness(*parent.get()); |