rowan.a.tl/HushGP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix skip not working

Browse Source
This commit is contained in:
Rowan Torbitzky-Lane 2025-02-14 01:20:54 -06:00
parent 2399b7660b
commit b7926662e1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/HushGP/Genome.hs
View File

@ -69,17 +69,17 @@ plushyToPush plushy = plushyToPush' (concatMap (\x -> if isOpenerList x then x <
-- | Internal function used to convert a plushy genome with opens in it into a push genome. -- | Internal function used to convert a plushy genome with opens in it into a push genome.
plushyToPush' :: [Gene] -> [Gene] -> [Gene] plushyToPush' :: [Gene] -> [Gene] -> [Gene]
plushyToPush' openPlushy push plushyToPush' openPlushy push
| null openPlushy = if any isOpen push | null openPlushy = trace "null" $ trace ("plushy: " <> show openPlushy) $ trace ("push: " <> show push) $ trace "--------------------" $ if any isOpen push
then plushyToPush' [Close] push then plushyToPush' [Close] push
else push else push
| firstPlushy == Close = if any isOpen push | firstPlushy == Close = trace "Close" $ trace ("plushy: " <> show openPlushy) $ trace ("push: " <> show push) $ trace "--------------------" $ if any isOpen push
then plushyToPush' (drop 1 openPlushy) (if numOpen (push !! openIndex) == 1 then preOpen <> [Block postOpen] else preOpen <> [Block (postOpen <> [decOpen (Open (numOpen (push !! openIndex)))])]) then plushyToPush' (drop 1 openPlushy) (if numOpen (push !! openIndex) == 1 then preOpen <> [Block postOpen] else preOpen <> [Block (postOpen <> [decOpen (Open (numOpen (push !! openIndex)))])])
else plushyToPush' (drop 1 openPlushy) push else plushyToPush' (drop 1 openPlushy) push
| firstPlushy == Skip = | firstPlushy == Skip = trace "Skip" $ trace ("plushy: " <> show openPlushy) $ trace ("push: " <> show push) $ trace "--------------------" $
case uncons openPlushy of case uncons openPlushy of
Just (_, _ : xs) -> plushyToPush' xs push Just (_, _ : xs) -> plushyToPush' xs push
_ -> plushyToPush' (drop 1 openPlushy) push _ -> plushyToPush' (drop 1 openPlushy) push
| otherwise = plushyToPush' (drop 1 openPlushy) (push <> [firstPlushy]) | otherwise = trace "otherwise" $ trace ("plushy: " <> show openPlushy) $ trace ("push: " <> show push) $ trace "--------------------" $ plushyToPush' (drop 1 openPlushy) (push <> [firstPlushy])
where where
firstPlushy :: Gene firstPlushy :: Gene
firstPlushy firstPlushy

2
src/HushGP/State.hs
View File

@ -53,6 +53,7 @@ instance Eq Gene where
GeneVectorChar xs == GeneVectorChar ys = xs == ys GeneVectorChar xs == GeneVectorChar ys = xs == ys
Close == Close = True Close == Close = True
Open x == Open y = x == y Open x == Open y = x == y
Skip == Skip = True
StateFunc (_, nameX) == StateFunc (_, nameY) = nameX == nameY StateFunc (_, nameX) == StateFunc (_, nameY) = nameX == nameY
Block x == Block y = x == y Block x == Block y = x == y
GeneIntERC (x, _) == GeneIntERC (y, _) = x == y GeneIntERC (x, _) == GeneIntERC (y, _) = x == y
@ -91,6 +92,7 @@ instance Ord Gene where
GeneVectorChar xs <= GeneVectorChar ys = xs <= ys GeneVectorChar xs <= GeneVectorChar ys = xs <= ys
Close <= Close = True Close <= Close = True
Open x <= Open y = x <= y Open x <= Open y = x <= y
Skip <= Skip = True
StateFunc (_, nameX) <= StateFunc (_, nameY) = nameX <= nameY StateFunc (_, nameX) <= StateFunc (_, nameY) = nameX <= nameY
Block x <= Block y = x <= y Block x <= Block y = x <= y
GeneIntERC (x, _) <= GeneIntERC (y, _) = x <= y GeneIntERC (x, _) <= GeneIntERC (y, _) = x <= y