Redo tree composition

2022-06-10 00:08:32 +01:00
parent 3edc7a0a58
commit 5532c25d3c
13 changed files with 114 additions and 52 deletions
@@ -32,9 +32,12 @@ layoutLevelFromSeed i seed = do
    appendFile "attemptedSeeds" $ show seed ++ "\n"
    let g = mkStdGen seed
    let treecluster = evalState initialRoomTree g
-    putStrLn "Room cluster layout:"
-    putStrLn $ drawTreeSubLabelling $ fmap snd treecluster
-    let rmtree = inorderNumberTree $ expandTree $ fmap fst treecluster
+        (strs,tc) = composeTree' treecluster
+    mapM putStrLn strs
+    --putStrLn "Room cluster layout:"
+    --putStrLn $ drawTreeSubLabelling $ fmap snd treecluster
+    --let rmtree = inorderNumberTree $ expandTree $ fmap fst treecluster
+    let rmtree = inorderNumberTree $ tc
    putStrLn "Room layout (compact): "
    putStrLn $ compactDrawTree $ fmap (show . snd) rmtree
    let nameshow (r,rid) = _rmName r ++ "-" ++ show rid