From f1d8680e4c9814cd5a8055b2632dddb8de52e771 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Thu, 25 Feb 2016 19:06:19 +0100
Subject: [PATCH] Use API better
---
src/main/scala/leon/synthesis/ExamplesFinder.scala | 2 +-
src/main/scala/leon/synthesis/rules/CEGISLike.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/scala/leon/synthesis/ExamplesFinder.scala b/src/main/scala/leon/synthesis/ExamplesFinder.scala
index 1c562d887..cfd3cf6d5 100644
--- a/src/main/scala/leon/synthesis/ExamplesFinder.scala
+++ b/src/main/scala/leon/synthesis/ExamplesFinder.scala
@@ -57,7 +57,7 @@ class ExamplesFinder(ctx0: LeonContext, program: Program) {
def isValidTest(e: Example): Boolean = {
e match {
case InOutExample(ins, outs) =>
- evaluator.eval(Equals(outs.head, FunctionInvocation(fd.typed(fd.tparams.map(_.tp)), ins))) match {
+ evaluator.eval(Equals(outs.head, FunctionInvocation(fd.typed, ins))) match {
case EvaluationResults.Successful(BooleanLiteral(true)) => true
case _ => false
}
diff --git a/src/main/scala/leon/synthesis/rules/CEGISLike.scala b/src/main/scala/leon/synthesis/rules/CEGISLike.scala
index b8a41fdf7..6f340554d 100644
--- a/src/main/scala/leon/synthesis/rules/CEGISLike.scala
+++ b/src/main/scala/leon/synthesis/rules/CEGISLike.scala
@@ -596,7 +596,7 @@ abstract class CEGISLike[T <: Typed](name: String) extends Rule(name) {
def solveForTentativeProgram(): Option[Option[Set[Identifier]]] = {
val solverf = SolverFactory.getFromSettings(hctx, programCTree).withTimeout(exSolverTo)
val solver = solverf.getNewSolver()
- val cnstr = FunctionInvocation(phiFd.typed, phiFd.params.map(_.id.toVariable))
+ val cnstr = phiFd.applied
//println("Program: ")
//println("-"*80)
--
GitLab