Skip to content
Snippets Groups Projects
Commit 160c0ae5 authored by Etienne Kneuss's avatar Etienne Kneuss
Browse files

Unroll more, keep predicates

parent 66fef8eb
Branches
Tags
No related merge requests found
...@@ -118,7 +118,8 @@ class CEGIS(synth: Synthesizer) extends Rule("CEGIS", synth, 150) { ...@@ -118,7 +118,8 @@ class CEGIS(synth: Synthesizer) extends Rule("CEGIS", synth, 150) {
var lastF = TentativeFormula(p.c, p.phi, BooleanLiteral(true), Map(), Map() ++ p.xs.map(x => x -> Set(x))) var lastF = TentativeFormula(p.c, p.phi, BooleanLiteral(true), Map(), Map() ++ p.xs.map(x => x -> Set(x)))
var currentF = lastF.unroll var currentF = lastF.unroll
var unrolings = 0 var unrolings = 0
val maxUnrolings = 2 val maxUnrolings = 3
var predicates: Seq[Expr] = Seq()
do { do {
//println("="*80) //println("="*80)
//println("Was: "+lastF.entireFormula) //println("Was: "+lastF.entireFormula)
...@@ -127,7 +128,6 @@ class CEGIS(synth: Synthesizer) extends Rule("CEGIS", synth, 150) { ...@@ -127,7 +128,6 @@ class CEGIS(synth: Synthesizer) extends Rule("CEGIS", synth, 150) {
val tpe = TupleType(p.xs.map(_.getType)) val tpe = TupleType(p.xs.map(_.getType))
val bss = currentF.bss val bss = currentF.bss
var predicates: Seq[Expr] = Seq()
var continue = true var continue = true
while (result.isEmpty && continue) { while (result.isEmpty && continue) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment