Skip to content

Commit

Permalink
Updated evo3 examples to use ONLY evo3 files.
Browse files Browse the repository at this point in the history
  • Loading branch information
mercere99 committed Aug 23, 2017
1 parent 03c321f commit b7eecfe
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion examples/evo3/Fitness_Share_NK.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <iostream>

#include "../../evo/NK-const.h"
#include "../../evo3/NK-const.h"
#include "../../evo3/World.h"
#include "../../tools/BitSet.h"
#include "../../tools/Random.h"
Expand Down
2 changes: 1 addition & 1 deletion examples/evo3/NK.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <iostream>

#include "../../config/ArgManager.h"
#include "../../evo/NK.h"
#include "../../evo3/NK.h"
#include "../../evo3/World.h"
#include "../../tools/BitVector.h"
#include "../../tools/Random.h"
Expand Down
8 changes: 4 additions & 4 deletions examples/evo3/NK.cfg
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
### DEFAULT ###
# Default settings for NK model

set K 5 # Level of epistasis in the NK model
set N 100 # Number of bits in each organisms (must be > K)
set K 10 # Level of epistasis in the NK model
set N 200 # Number of bits in each organisms (must be > K)
set SEED 1 # Random number seed (0 for based on time)
set POP_SIZE 10 # Number of organisms in the popoulation.
set MAX_GENS 10 # How many generations should we process?
set POP_SIZE 1000 # Number of organisms in the popoulation.
set MAX_GENS 500 # How many generations should we process?
set MUT_COUNT 3 # How many bit positions should be randomized?
set MY_VAL 20
1 change: 1 addition & 0 deletions examples/evo3/World.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ struct TestOrg1 {
bool DoMutate(emp::Random&) { return false; }

bool operator==(const TestOrg1 & in) const { return fitness == in.fitness; }
bool operator!=(const TestOrg1 & in) const { return fitness != in.fitness; }
};

int main() {
Expand Down

0 comments on commit b7eecfe

Please sign in to comment.