Skip to content

Commit

Permalink
move a bunch of loading code into Wave
Browse files Browse the repository at this point in the history
  • Loading branch information
@BrianHicks
BrianHicks committed Feb 21, 2020
1 parent 24f22d9 commit cfe52e6
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 99 deletions.
128 changes: 44 additions & 84 deletions src/Main.elm
View file
Expand Up @@ -25,14 +25,10 @@ import Wave exposing (Wave)
type alias Model =
{ image : Image
, windowSize : { width : Int, height : Int }
, windows : Grid Image
, wave : Wave Int
, wave : Wave Color.Color Int
, waveSize : { width : Int, height : Int }
, seed : Random.Seed
, running : Bool
, indexes : Dict Int Image
, weights : Dict Int Int
, rules : Adjacency.Rules Int
, showEntropy : Bool
, dimUnknown : Bool
}
Expand All @@ -57,85 +53,48 @@ init _ =

load : Image -> { width : Int, height : Int } -> Model
load image windowSize =
let
windows =
Grid.windows windowSize image

withIndex =
Grid.map
(\window ->
( window
|> Grid.toArrays
|> Array.foldr
(\row rowString ->
Array.foldr (\value string -> Color.toRGBAString value ++ string)
rowString
row
)
""
|> Murmur3.hashString 0
, window
)
)
windows

indexes =
-- wow there is a lot of conversion happening here. Probably should
-- come back and make it more efficient sometime.
withIndex
|> Grid.toArrays
|> Array.foldl Array.append Array.empty
|> Array.toList
|> Dict.fromList

weights =
-- wow there is a lot of conversion happening here. Probably should
-- come back and make it more efficient sometime.
withIndex
|> Grid.toArrays
|> Array.foldl Array.append Array.empty
|> Array.foldl
(\( id, _ ) dict ->
Dict.update id
(\maybeCount ->
case maybeCount of
Just count ->
Just (count + 1)

Nothing ->
Just 1
)
dict
)
Dict.empty

rules =
withIndex
|> Grid.map Tuple.first
|> Adjacency.fromIds
|> Adjacency.finalize
in
{ image = image
, windowSize = windowSize
, windows = windows
, wave = Wave.init rules weights { width = 20, height = 20 }
, wave =
Wave.load
{ windowSize = windowSize
, waveSize = { width = 20, height = 20 }
, hash = imageHash
}
image
, waveSize = { width = 20, height = 20 }
, seed = Random.initialSeed 0
, running = False
, indexes = indexes
, weights = weights
, rules = rules
, showEntropy = False
, dimUnknown = False
}


imageHash : Image -> Int
imageHash =
Grid.toArrays
>> Array.foldr
(\row rowString ->
Array.foldr (\value string -> Color.toRGBAString value ++ string)
rowString
row
)
""
>> Murmur3.hashString 0


update : Msg -> Model -> ( Model, Cmd Msg )
update msg model =
case msg of
Reset dimensions ->
( { model
| wave = Wave.init model.rules model.weights dimensions
| wave =
Wave.load
{ windowSize = model.windowSize
, waveSize = dimensions
, hash = imageHash
}
model.image
, waveSize = dimensions
}
, Cmd.none
Expand Down Expand Up @@ -218,18 +177,19 @@ view model =
, Image.view [] model.image
, Html.details []
[ Html.summary [] [ Html.text "Windows" ]
, model.windows
|> Grid.view
(\window ->
Html.div
[ css
[ Css.border3 (Css.px 1) Css.solid (Css.hex "000")
, Css.display Css.inlineBlock
, Css.margin (Css.px 5)
]
]
[ Image.view [] window ]
)

-- , model.windows
-- |> Grid.view
-- (\window ->
-- Html.div
-- [ css
-- [ Css.border3 (Css.px 1) Css.solid (Css.hex "000")
-- , Css.display Css.inlineBlock
-- , Css.margin (Css.px 5)
-- ]
-- ]
-- [ Image.view [] window ]
-- )
]
, h2 [ Html.text "Wave" ]
, Html.p []
Expand All @@ -252,10 +212,10 @@ view model =
, Html.button [ Events.onClick ToggleDimUnknown ] [ Html.text "Toggle Dimming Uknown Cells (debug)" ]
]
, Wave.view
(\cell ->
(\windows cell ->
case cell of
Wave.Collapsed tile ->
case Dict.get tile model.indexes |> Maybe.andThen Grid.topLeft of
case Dict.get tile windows |> Maybe.andThen Grid.topLeft of
Just color ->
Image.viewColor [] color

Expand All @@ -267,7 +227,7 @@ view model =
{ reds, blues, greens, opacities } =
indexes
|> Set.toList
|> List.filterMap (\i -> Dict.get i model.indexes)
|> List.filterMap (\i -> Dict.get i windows)
|> List.filterMap Grid.topLeft
|> List.foldl
(\color soFar ->
Expand Down
101 changes: 86 additions & 15 deletions src/Wave.elm
View file
@@ -1,6 +1,7 @@
module Wave exposing (Cell(..), Wave, getEntropy, init, step, view)
module Wave exposing (Cell(..), Wave, getEntropy, init, load, step, view)

import Adjacency
import Array
import Dict exposing (Dict)
import Direction exposing (Direction)
import Grid exposing (Grid)
Expand All @@ -21,20 +22,21 @@ type Cell comparable
| Collapsed comparable


type Wave comparable
type Wave a comparable
= Wave
{ weights : Dict comparable Int
, rules : Adjacency.Rules comparable
, entropy : Heap Entropy
, items : Grid (Cell comparable)
, windows : Dict comparable (Grid a)
}



-- DEBUG INFO


getEntropy : Wave comparable -> Heap Entropy
getEntropy : Wave a comparable -> Heap Entropy
getEntropy (Wave guts) =
guts.entropy

Expand All @@ -43,8 +45,76 @@ getEntropy (Wave guts) =
-- END DEBUG


init : Adjacency.Rules comparable -> Dict comparable Int -> { width : Int, height : Int } -> Wave comparable
init rules weights dimensions =
{-| TODO: this should maybe be init and the thing that is `init` now could be
called `custom`? Or something?
-}
load :
{ windowSize : { width : Int, height : Int }
, waveSize : { width : Int, height : Int }
, hash : Grid a -> comparable
}
-> Grid a
-> Wave a comparable
load options grid =
let
windows : Grid (Grid a)
windows =
Grid.windows options.windowSize grid

withIndex : Grid ( comparable, Grid a )
withIndex =
Grid.map
(\window ->
( options.hash window
, window
)
)
windows

indexes : Dict comparable (Grid a)
indexes =
-- wow there is a lot of conversion happening here. Probably should
-- come back and make it more efficient sometime.
withIndex
|> Grid.toArrays
|> Array.foldl Array.append Array.empty
|> Array.toList
|> Dict.fromList

weights : Dict comparable Int
weights =
-- wow there is a lot of conversion happening here. Probably should
-- come back and make it more efficient sometime.
withIndex
|> Grid.toArrays
|> Array.foldl Array.append Array.empty
|> Array.foldl
(\( id, _ ) dict ->
Dict.update id
(\maybeCount ->
case maybeCount of
Just count ->
Just (count + 1)

Nothing ->
Just 1
)
dict
)
Dict.empty

rules : Adjacency.Rules comparable
rules =
withIndex
|> Grid.map Tuple.first
|> Adjacency.fromIds
|> Adjacency.finalize
in
init indexes rules weights options.waveSize


init : Dict comparable (Grid a) -> Adjacency.Rules comparable -> Dict comparable Int -> { width : Int, height : Int } -> Wave a comparable
init windows rules weights dimensions =
let
initialCell =
Open (Set.fromList (Dict.keys weights))
Expand All @@ -53,7 +123,8 @@ init rules weights dimensions =
entropy weights (Set.fromList (Dict.keys weights))
in
Wave
{ weights = weights
{ windows = windows
, weights = weights
, rules = rules
, entropy =
List.range 0 (dimensions.width - 1)
Expand Down Expand Up @@ -82,7 +153,7 @@ init rules weights dimensions =
}


step : Random.Seed -> Wave comparable -> ( Wave comparable, Random.Seed )
step : Random.Seed -> Wave a comparable -> ( Wave a comparable, Random.Seed )
step seed (Wave wave) =
case Heap.pop wave.entropy of
Just ( { coords }, poppedEntropy ) ->
Expand All @@ -95,7 +166,7 @@ step seed (Wave wave) =

{-| Step one!
-}
collapse : Random.Seed -> { row : Int, column : Int } -> Wave comparable -> ( Wave comparable, Random.Seed )
collapse : Random.Seed -> { row : Int, column : Int } -> Wave a comparable -> ( Wave a comparable, Random.Seed )
collapse seed coords (Wave wave) =
case Grid.get coords wave.items of
Just (Open remaining) ->
Expand Down Expand Up @@ -151,8 +222,8 @@ collapse seed coords (Wave wave) =

propagate :
List { row : Int, column : Int }
-> Wave comparable
-> Wave comparable
-> Wave a comparable
-> Wave a comparable
propagate todo (Wave wave) =
case todo of
[] ->
Expand Down Expand Up @@ -191,8 +262,8 @@ propagateInDirection :
{ row : Int, column : Int }
-> Cell comparable
-> Direction
-> ( Wave comparable, List { row : Int, column : Int } )
-> ( Wave comparable, List { row : Int, column : Int } )
-> ( Wave a comparable, List { row : Int, column : Int } )
-> ( Wave a comparable, List { row : Int, column : Int } )
propagateInDirection source sourceCell direction ( Wave wave, todo ) =
let
target =
Expand Down Expand Up @@ -273,6 +344,6 @@ entropy weights possibilities =
|> List.sum


view : (Cell comparable -> Html msg) -> Wave comparable -> Html msg
view viewCell (Wave { items }) =
Grid.view viewCell items
view : (Dict comparable (Grid a) -> Cell comparable -> Html msg) -> Wave a comparable -> Html msg
view viewCell (Wave { items, windows }) =
Grid.view (viewCell windows) items

0 comments on commit cfe52e6

Please sign in to comment.