X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=code%2FSokobanObjectwise.icl;h=656fad8312292a46978193aad47dc031f358488b;hb=59b2b66a7c7b6585ebd30e8c530b9f826bcc70e9;hp=558cc4f2c83430b78602fb9239f5969ed109038a;hpb=fd2b1775e5bd5172560e2cb3e2d0878d46a50b60;p=mc1516pa.git

diff --git a/code/SokobanObjectwise.icl b/code/SokobanObjectwise.icl
index 558cc4f..656fad8 100644
--- a/code/SokobanObjectwise.icl
+++ b/code/SokobanObjectwise.icl
@@ -6,8 +6,15 @@ import StdTuple
 import StdFunc
 import StdOrdList
 import StdList
+
+from Data.Func import $
+from Data.List import intercalate, maximum, permutations
+from Text import class Text(concat,join), instance Text String
+
 import Sokoban
 
+:: AnnotatedSokoban :== [(Int, Int, SokobanTile)]
+
 Start :: *World -> *World
 Start w
 # (io, w) = stdio w
@@ -16,36 +23,133 @@ Start w
 = snd (fclose io w)
 
 encode :: SokobanPuzzle -> String
-encode p = foldr ((+++) o (+++) "\n") "" ([
-	"MODULE", 
-	"main",
-	"VAR":encodeBoxes p maxX maxY])
+encode p = join "\n" [
+	"MODULE ob(ix, iy)",
+	"VAR",
+	"\tx: 0.." <+ maxX <+ ";",
+	"\ty: 0.." <+ maxY <+ ";",
+	"INIT x=ix & y=iy",
+	"INVAR " <+ encodeObPosition legalPos,
+	"",
+	"MODULE main",
+	"VAR",
+	"\tagent: " <+ declareObject agent,
+	join "\n" ["\tb" <+ i <+ ": " <+ declareObject b\\i<-boxnums & b<-boxes],
+	"\tmovement: {left, up, right, down, finished};",
+	"--Handy variable for deltas",
+	deltaDefine,
+	"--Agent not on the box",
+	"INVAR " <+ encodeAgentNotOnBox boxnums <+ ";",
+	"--Box not on box",
+	"INVAR " <+ encodeBoxOnBoxes boxnums <+ ";",
+	"--Goal state",
+	"INVAR " <+ encodeGoalState boxnums targetPos <+ ";",
+	"--Agent movement",
+	encodeObMovement "agent",
+	"--Box movement",
+	encodeBoxMovement boxnums,
+	"CTLSPEC ! EF (movement = finished);",
+
+	""]
 	where
+		targetPos = getTargets annot
+		boxes = getBoxes annot
+		boxnums = indexList boxes
+		agent = hd $ getAgents annot
+		legalPos = legalPositions annot
 		annot = annotate p
 		(maxX, maxY) = getMetrics annot
 
-:: AnnotatedSokoban :== [(Int, Int, SokobanTile)]
+declareObject :: (Int, Int) -> String
+declareObject (x, y) = "ob(" <+ x <+ ", " <+ y <+ ");"
+
+deltaDefine :: String
+deltaDefine = join "\n" [
+	"DEFINE dx := case",
+	"\t\tmovement = left : -1;",
+	"\t\tmovement = right: +1;",
+	"\t\tTRUE:              0;",
+	"\tesac;",
+	"\tdy := case",
+	"\t\tmovement = up  : -1;",
+	"\t\tmovement = down: +1;",
+	"\t\tTRUE:             0;",
+	"\tesac;"]
+
+//THIS IS NAIVE AND SHOULD BE IMPROVED
+legalPositions :: AnnotatedSokoban -> [(Int, Int)]
+legalPositions p = [(x, y)\\(x, y, t)<-p | case t of Wall=False; _=True]
 
 annotate :: SokobanPuzzle -> AnnotatedSokoban
 annotate (Sokoban p) = flatten [[(x, y, t)\\t<-r & x<-[0..]]\\r<-p & y<-[0..]]
 
+getTargets :: AnnotatedSokoban -> [(Int, Int)]
+getTargets p = [(x, y)\\(x, y, t)<-p | 
+	case t of Target=True;TargetBox=True;TargetAgent=True;_=False] 
+
 getMetrics :: AnnotatedSokoban -> (Int, Int)
-getMetrics p = (maxList (map fst3 p),maxList (map snd3 p))
+getMetrics p = (maximum (map fst3 p),maximum (map snd3 p))
 
-getBoxes :: AnnotatedSokoban -> [(Int, Int)]
-getBoxes p = [t\\t=:(_, _, Box)<-p] ++ 
+getAgents :: AnnotatedSokoban -> [(Int, Int)]
+getAgents p = [(x, y)\\(x, y, Agent)<-p] ++ [(x, y)\\(x, y, TargetAgent)<-p]
 
-	where
-		getBox` _ [] = []
-		getBox` x [b:bs] = let r = getBox` (x+1) bs in case b of
-				Box = [x:r]
-				TargetBox = [x:r]
-				_ = r
+getBoxes :: AnnotatedSokoban -> [(Int, Int)]
+getBoxes p = [(x, y)\\(x, y, Box)<-p] ++ [(x, y)\\(x, y, TargetBox)<-p]
 
 (<+) infixr 5 :: a b -> String | toString a & toString b
 (<+) a b = toString a +++ toString b
 
-encodeBoxes :: SokobanPuzzle Int Int -> [String]
-encodeBoxes p mx my = [
-	"\tbox" <+ i <+ "x: " <+ "0 .. " <+ mx <+ ";\n\tbox" <+
-	i <+ "y: " <+ "0 .. " <+ my <+ ";"\\(bx, by)<-getBoxes p & i<-[0..]]
+encodeGoalState :: [Int] [(Int, Int)] -> String
+encodeGoalState boxes targets = "(" <+
+	join " |\n\t" (map encodeOneGoal boxtargets) <+ ")<->movement=finished"
+	where
+		boxtargets = map (zip2 targets) (permutations boxes)
+		
+		encodeOneGoal :: [((Int, Int), Int)] -> String
+		encodeOneGoal p = "(" <+ join " & " (encodeOneGoal` p) <+ ")"
+
+		encodeOneGoal` :: [((Int, Int), Int)] -> [String]
+		encodeOneGoal` [] = []
+		encodeOneGoal` [((x, y), b):xs] = [
+			"b" <+ b <+ ".x = " <+ x <+ " & " <+
+			"b" <+ b <+ ".y = " <+ y:encodeOneGoal` xs]
+
+encodeBoxOnBoxes :: [Int] -> String
+encodeBoxOnBoxes [] = ""
+encodeBoxOnBoxes [b] = "TRUE"
+encodeBoxOnBoxes [b:bs] = encodeBoxOnBox b bs <+ " &\n\t" <+
+	encodeBoxOnBoxes bs
+	where
+		encodeBoxOnBox :: Int [Int] -> String
+		encodeBoxOnBox x bs = join " & " ["!(b" <+ x <+ ".x=b" <+ b <+ ".x &" <+ 
+			"b" <+ x <+ ".y=b" <+ b <+ ".y)"\\b<-bs]
+
+encodeAgentNotOnBox :: [Int] -> String
+encodeAgentNotOnBox bs = join " &\n\t" [
+	"!(b" <+ i <+ ".x = agent.x & b" <+ i <+ ".y = agent.y)"\\i<-bs]
+
+encodeObMovement :: String -> String
+encodeObMovement s = "TRANS next(" <+ s <+ ".x) = " <+ s <+ ".x + dx & " <+
+	"next(" <+ s <+ ".y) = " <+ s <+ ".y + dy;"
+
+encodeObPosition :: [(Int, Int)] -> String
+encodeObPosition p = join " |\n\t" [forThisX x p\\x<-removeDup $ map fst p]
+	where
+		forThisX :: Int [(Int, Int)] -> String
+		forThisX cx p = "(x=" <+ cx <+ " & (" <+
+			join " | " ["y=" <+ y \\(x, y)<-p | x == cx] <+ "))"
+
+encodeBoxMovement :: [Int] -> String
+encodeBoxMovement bs = join "\n" $ map ebm bs
+	where
+		ebm :: Int -> String
+		ebm i = "TRANS next(b" <+ i <+ ".x) = case\n" <+
+			"\t\tnext(agent.x) = b" <+ i <+ ".x & " <+
+			"next(agent.y) = b" <+ i <+ ".y: b" <+ i <+ ".x + dx;\n" <+
+			"\t\tTRUE: b" <+ i <+ ".x;\n" <+
+			"\tesac;\n" <+
+			"TRANS next(b" <+ i <+ ".y) = case\n" <+
+			"\t\tnext(agent.x) = b" <+ i <+ ".x & " <+
+			"next(agent.y) = b" <+ i <+ ".y: b" <+ i <+ ".y + dy;\n" <+
+			"\t\tTRUE: b" <+ i <+ ".y;\n" <+
+			"\tesac;"