add rewriting switch

rudymatela · Feb 14, 2024 · 4ea4d79 · 4ea4d79
1 parent 37b9b97
commit 4ea4d79
Show file tree

Hide file tree

Showing 25 changed files with 28 additions and 25 deletions.
diff --git a/bench/runtime/lapmatrud/bench/candidates.runtime b/bench/runtime/lapmatrud/bench/candidates.runtime
@@ -1 +1 @@
-9.4
+9.7
diff --git a/bench/runtime/lapmatrud/bench/carry-on.runtime b/bench/runtime/lapmatrud/bench/carry-on.runtime
@@ -1 +1 @@
-3.0
+2.7
diff --git a/bench/runtime/lapmatrud/bench/gps.runtime b/bench/runtime/lapmatrud/bench/gps.runtime
@@ -1 +1 @@
-14.3
+14.2
diff --git a/bench/runtime/lapmatrud/bench/gps2.runtime b/bench/runtime/lapmatrud/bench/gps2.runtime
@@ -1 +1 @@
-12.3
+12.8
diff --git a/bench/runtime/lapmatrud/bench/ill-hit.runtime b/bench/runtime/lapmatrud/bench/ill-hit.runtime
@@ -1 +1 @@
-0.4
+0.5
diff --git a/bench/runtime/lapmatrud/bench/p12.runtime b/bench/runtime/lapmatrud/bench/p12.runtime
@@ -1 +1 @@
-1.7
+1.6
diff --git a/bench/runtime/lapmatrud/bench/redundants.runtime b/bench/runtime/lapmatrud/bench/redundants.runtime
@@ -1 +1 @@
-2.9
+3.0
diff --git a/bench/runtime/lapmatrud/bench/take-drop.runtime b/bench/runtime/lapmatrud/bench/take-drop.runtime
@@ -1 +1 @@
-0.4
+0.3
diff --git a/bench/runtime/lapmatrud/bench/terpret.runtime b/bench/runtime/lapmatrud/bench/terpret.runtime
@@ -1 +1 @@
-8.3
+7.9
diff --git a/bench/runtime/lapmatrud/eg/bools.runtime b/bench/runtime/lapmatrud/eg/bools.runtime
@@ -1 +1 @@
-1.6
+1.7
diff --git a/bench/runtime/lapmatrud/eg/bst.runtime b/bench/runtime/lapmatrud/eg/bst.runtime
@@ -1 +1 @@
-7.5
+7.4
diff --git a/bench/runtime/lapmatrud/eg/count.runtime b/bench/runtime/lapmatrud/eg/count.runtime
@@ -1 +1 @@
-0.3
+0.4
diff --git a/bench/runtime/lapmatrud/eg/dupos.runtime b/bench/runtime/lapmatrud/eg/dupos.runtime
@@ -1 +1 @@
-3.2
+3.5
diff --git a/bench/runtime/lapmatrud/eg/factorial.runtime b/bench/runtime/lapmatrud/eg/factorial.runtime
@@ -1 +1 @@
-1.2
+1.3
diff --git a/bench/runtime/lapmatrud/eg/fib01.runtime b/bench/runtime/lapmatrud/eg/fib01.runtime
@@ -1 +1 @@
-1.3
+1.7
diff --git a/bench/runtime/lapmatrud/eg/fibonacci.runtime b/bench/runtime/lapmatrud/eg/fibonacci.runtime
@@ -1 +1 @@
-4.1
+4.4
diff --git a/bench/runtime/lapmatrud/eg/higher.runtime b/bench/runtime/lapmatrud/eg/higher.runtime
@@ -1 +1 @@
-0.6
+0.7
diff --git a/bench/runtime/lapmatrud/eg/list.runtime b/bench/runtime/lapmatrud/eg/list.runtime
@@ -1 +1 @@
-1.0
+1.1
diff --git a/bench/runtime/lapmatrud/eg/maybe.runtime b/bench/runtime/lapmatrud/eg/maybe.runtime
@@ -1 +1 @@
-0.2
+0.3
diff --git a/bench/runtime/lapmatrud/eg/oddeven.runtime b/bench/runtime/lapmatrud/eg/oddeven.runtime
@@ -1 +1 @@
-1.4
+1.6
diff --git a/bench/runtime/lapmatrud/eg/pow.runtime b/bench/runtime/lapmatrud/eg/pow.runtime
@@ -1 +1 @@
-3.9
+4.1
diff --git a/bench/runtime/lapmatrud/eg/replicate.runtime b/bench/runtime/lapmatrud/eg/replicate.runtime
@@ -1 +1 @@
-0.4
+0.3
diff --git a/bench/runtime/lapmatrud/eg/setelem.runtime b/bench/runtime/lapmatrud/eg/setelem.runtime
@@ -1 +1 @@
-1.3
+1.1
diff --git a/bench/runtime/lapmatrud/eg/tapps.runtime b/bench/runtime/lapmatrud/eg/tapps.runtime
@@ -1 +1 @@
-0.4
+0.5
diff --git a/src/Conjure/Engine.hs b/src/Conjure/Engine.hs
@@ -166,6 +166,7 @@ data Args = Args
   , usePatterns           :: Bool -- ^ use pattern matching to create (recursive) candidates
 
   -- pruning options --
+  , rewriting             :: Bool -- ^ unique-modulo-rewriting candidates
   , requireDescent        :: Bool -- ^ require recursive calls to deconstruct arguments
   , adHocRedundancy       :: Bool -- ^ ad-hoc redundancy checks
   , copyBindings          :: Bool -- ^ copy partial definition bindings in candidates
@@ -200,6 +201,7 @@ args = Args
   , usePatterns            =  True
 
   -- pruning options --
+  , rewriting              =  True
   , requireDescent         =  True
   , adHocRedundancy        =  True
   , copyBindings           =  True
@@ -381,7 +383,8 @@ candidateExprs Args{..} nm f ps  =  (as \/ concatMapT (`enumerateFillings` recs)
   eh  =  holeAsTypeOf efxs
   efxs  =  conjureVarApplication nm f
   (ef:exs)  =  unfoldApp efxs
-  keep  =  isRootNormalC thy . fastMostGeneralVariation
+  keep | rewriting  =  isRootNormalC thy . fastMostGeneralVariation
+       | otherwise  =  const True
   keepR | requireDescent  =  descends isDecOf efxs
         | otherwise       =  const True
     where