Changeset 24

Timestamp:

07/27/08 00:25:57 (2 years ago)

Author:

thesz

Message:

Added problem from Omega test paper. It is considered solvable by our contraint handler. Going to recovering range conditions from a list of MIN/MAX pairs.

Files:

• fort/IConstr.hs (modified) (5 diffs)

fort/IConstr.hs

@@ -38 +38 @@
-vecC = Vec Map.empty
-vec0 = vecC 0
+vec1 = vecC 1
-vecV v = Vec (Map.singleton v 1) 0
-vecCV c v
@@ -57 +58 @@
-vecMinus a b = mergeVecs (-) a b        
-
-
+
+
-
-vecConst (Vec _ c) = c
@@ -333 +335 @@
-        return ()
-
-E []     []  = return ()
-E
+T [i]    [j]  = insertIE (vecPlus i vec1) LE j
+T
-                insertEQ i j
-E
+T
-        +++ do
-i
-E
+(vecPlus i vec1)
+T
-        
-
@@ -363 +365 @@
---   do i=1,n
---     m[2,j]=m[i,2]
+-- ie, is there any read at [j',i'] that depends on write at [j,i] and [j,i] < [j',i']
--- This means the following:
---  ranges as usual: 1<=i,j<=n
@@ -372 +375 @@
-        let one = vecC 1
-        betweens [i,j,i1,j1] one n
-E
+T
-        insertEQ i        (vecC 2)
-        insertEQ (vecC 2) j
+
+-- the problem from Omega test paper by Pugh.
+-- 7x + 12y + 31z = 17
+-- 3x + 5y + 14z = 7
+-- 1 <= x <= 40
+-- -50 <= y <= 50
+-- Should be solvable.
+otprob :: SolverM String ()
+otprob = do
+        let [x,y,z] = map vecV ["x","y","z"]
+        between x (vec1) (vecC 40)
+        between y (vecC (-50)) (vecC 50)
+        insertEQ (vecFromCoefs [(7,x),(12,y),(31,z)]) (vecC 17)
+        insertEQ (vecFromCoefs [(3,x),(5,y),(14,z)]) (vecC 7)
-
---------------------------------------------------------------------------------