From 6bff8ded80ef007bd9758bec4c8df03e34c2f646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Mayer?= <a-mikmay@microsoft.com> Date: Tue, 22 Dec 2015 17:52:55 +0100 Subject: [PATCH] More exprs and solutions to consider --- .../synthesis/disambiguation/QuestionBuilder.scala | 4 ++-- testcases/stringrender/DoubleListRender.scala | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/scala/leon/synthesis/disambiguation/QuestionBuilder.scala b/src/main/scala/leon/synthesis/disambiguation/QuestionBuilder.scala index 7b0de3e68..e356d40bb 100644 --- a/src/main/scala/leon/synthesis/disambiguation/QuestionBuilder.scala +++ b/src/main/scala/leon/synthesis/disambiguation/QuestionBuilder.scala @@ -89,8 +89,8 @@ class QuestionBuilder[T <: Expr](input: Seq[Identifier], solutions: Stream[Solut private var _argTypes = input.map(_.getType) private var _questionSorMethod: QuestionSortingType = QuestionSortingType.IncreasingInputSize private var _alternativeSortMethod: AlternativeSortingType[T] = AlternativeSortingType.BalancedParenthesisIsBetter[T]() && AlternativeSortingType.ShorterIsBetter[T]() - private var solutionsToTake = 15 - private var expressionsToTake = 15 + private var solutionsToTake = 30 + private var expressionsToTake = 30 private var keepEmptyAlternativeQuestions: T => Boolean = Set() /** Sets the way to sort questions. See [[QuestionSortingType]] */ diff --git a/testcases/stringrender/DoubleListRender.scala b/testcases/stringrender/DoubleListRender.scala index 284760380..bd0dba714 100644 --- a/testcases/stringrender/DoubleListRender.scala +++ b/testcases/stringrender/DoubleListRender.scala @@ -48,6 +48,16 @@ object DoubleListRender { "[([()])]" case B(BB(N(), BB(N(), BB(N(), NN()))), N()) => "[([], [], [])]" + case B(NN(), B(BB(N(), NN()), B(NN(), N()))) => + "[(), ([]), ()]" + case B(BB(B(NN(), N()), BB(N(), NN())), N()) => + "[([()], [])]" + case B(BB(B(BB(N(), NN()), N()), NN()), N()) => + "[([([])])]" + case B(BB(B(NN(), B(NN(), N())), NN()), N()) => + "[([(), ()])]" + case B(BB(N(), BB(B(NN(), N()), NN())), N()) => + "[([], [()])]" } } } \ No newline at end of file -- GitLab