Compare commits

..

No commits in common. "53c490b3b3450c51fa706c8f20b6584b47ae5d27" and "6e9b9a4827fa6280ddbbdf0546f96444208a1a6b" have entirely different histories.

5 changed files with 2 additions and 15 deletions

View File

@ -62,7 +62,6 @@ library
, HushGP.PushTests.UtilTests
, HushGP.GP
, HushGP.GP.PushArgs
, HushGP.GP.Variation
, HushGP.Problems.IntegerRegression

View File

@ -45,7 +45,3 @@ This is clearly not ideal.
4) For the exec stack itself,
typeable, data generic, ghc.generic, data.dynamic, heterogeneous lists, etc. could also help,
to detect the type of variables at runtime, but I would rather stick to language basics at first.
## Nix Users
This took my machine about 2 hours to build the environment after running `nix develop`.

View File

@ -27,7 +27,6 @@
- I'm only going to implement propeller's :specified version
- Is the best according to the papers
- [X] Need a NoOp that opens blocks
- [ ] Have a way to balance amount of closes with open blocks
- [ ] Need to make genomes serializable (Check pysh json files)
- [ ] Add Memory
- [ ] Add history stack(s), like a call stack

View File

@ -33,7 +33,7 @@ gpLoop pushArgs = do
unEvaledPopulation <- generatePopulation pushArgs
-- let evaledPop = evaluatePopulation pushArgs unEvaledPopulation
-- print evaledPop
print "placeholder for now"
print "gamer"
-- | The guts of the GP loop. Where the work gets done after the initialization happens
-- in the main gpLoop function. The first Int holds the generation count. The second Int
@ -58,7 +58,7 @@ gpLoop' pushArgs generation evaluations population indexedTrainingData = do
print "Incomplete Run, saving the best so far."
| otherwise = gpLoop' pushArgs (succ generation)
(evaluations + (populationSize pushArgs * length (fst $ trainingData pushArgs)) + (if generation `mod` downsampleParentsGens pushArgs == 0 then length parentReps * (length (fst indexedTrainingData) - length (fst $ trainingData pushArgs)) else 0) + (if bestIndPassesDownsample then length (fst indexedTrainingData) - length (fst $ trainingData pushArgs) else 0))
(if elitism then bestInd : )
(if elitism then )
nextAction
where
-- \| This will have downsampling added to it later.

View File

@ -1,7 +0,0 @@
module HushGP.GP.Variation where
import HushGP.Genome
import HushGP.GP.PushArgs
newIndividual :: PushArgs -> [Individual] -> Individual
newIndividual = error "Implement this later"