From be90afcfac2046ff249818c06548e11fc676c4a1 Mon Sep 17 00:00:00 2001
From: SimonGuilloud <sim-guilloud@bluewin.ch>
Date: Wed, 13 Jul 2022 14:36:12 +0200
Subject: [PATCH] Updated tests and examples.
---
lisa-examples/src/main/scala/Example.scala | 18 +++++++++---------
.../src/test/scala/lisa/kernel/FolTests.scala | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lisa-examples/src/main/scala/Example.scala b/lisa-examples/src/main/scala/Example.scala
index 85e45928..57fee33e 100644
--- a/lisa-examples/src/main/scala/Example.scala
+++ b/lisa-examples/src/main/scala/Example.scala
@@ -139,15 +139,15 @@ object Example {
p.formulas.foreach(printAnnotatedFormula)
}
- val P = SchematicPredicateLabel("P", 1)
-
- val Q = PredicateFormula(SchematicPredicateLabel("Q", 0), Seq())
- val R = PredicateFormula(SchematicPredicateLabel("R", 0), Seq())
- val S = PredicateFormula(SchematicPredicateLabel("S", 0), Seq())
- val T = PredicateFormula(SchematicPredicateLabel("T", 0), Seq())
- val A = PredicateFormula(SchematicPredicateLabel("A", 0), Seq())
- val B = PredicateFormula(SchematicPredicateLabel("B", 0), Seq())
- val C = PredicateFormula(SchematicPredicateLabel("C", 0), Seq())
+ val P = SchematicNPredicateLabel("P", 1)
+
+ val Q = PredicateFormula(VariableFormulaLabel("Q"), Seq())
+ val R = PredicateFormula(VariableFormulaLabel("R"), Seq())
+ val S = PredicateFormula(VariableFormulaLabel("S"), Seq())
+ val T = PredicateFormula(VariableFormulaLabel("T"), Seq())
+ val A = PredicateFormula(VariableFormulaLabel("A"), Seq())
+ val B = PredicateFormula(VariableFormulaLabel("B"), Seq())
+ val C = PredicateFormula(VariableFormulaLabel("C"), Seq())
val x = VariableLabel("x")
val f = ConstantFunctionLabel("f", 1)
diff --git a/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala b/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala
index f39b1bd2..19c8e670 100644
--- a/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala
+++ b/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala
@@ -101,7 +101,7 @@ class FolTests extends AnyFunSuite {
private val a = PredicateFormula(ConstantPredicateLabel("A", 0), Seq())
private val b = PredicateFormula(ConstantPredicateLabel("B", 0), Seq())
private val fp = ConstantPredicateLabel("F", 1)
- private val sT = SchematicFunctionLabel("t", 0)
+ private val sT = VariableLabel("t")
def test_some_random_formulas(n: Int, maxDepth: Int): Unit = {
(0 to n).foreach(_ => println(formulaGenerator(maxDepth)))
--
GitLab