From 51c130209f7b7f83a23fc708b0e5f1a3b050ccdb Mon Sep 17 00:00:00 2001 From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch> Date: Wed, 8 Jul 2015 16:53:44 +0200 Subject: [PATCH] Consistent benchmark names --- .../verification/newsolvers/valid/ArrayLiterals.scala | 2 +- .../verification/newsolvers/valid/ArrayUpdated.scala | 2 +- .../regression/verification/newsolvers/valid/Asserts1.scala | 2 +- .../regression/verification/newsolvers/valid/FiniteSort.scala | 2 +- .../newsolvers/valid/{Generics2.scala => Generics1.scala} | 0 .../verification/newsolvers/valid/{Heap.scala => Heaps.scala} | 0 .../verification/purescala/invalid/CharCompare.scala | 2 +- .../verification/purescala/valid/ArrayLiterals.scala | 3 ++- .../regression/verification/purescala/valid/ArrayUpdated.scala | 2 +- .../regression/verification/purescala/valid/Asserts1.scala | 2 +- .../valid/{BVDivSemantic.scala => BVDivSemantics.scala} | 0 .../regression/verification/purescala/valid/FiniteSort.scala | 2 +- .../purescala/valid/{Generics2.scala => Generics1.scala} | 0 .../verification/purescala/valid/{Heap.scala => Heaps.scala} | 0 .../purescala/valid/{TextJustifyNoPost.scala => Justify.scala} | 0 .../purescala/valid/{MapPlus.scala => MapGetPlus.scala} | 0 16 files changed, 10 insertions(+), 9 deletions(-) rename src/test/resources/regression/verification/newsolvers/valid/{Generics2.scala => Generics1.scala} (100%) rename src/test/resources/regression/verification/newsolvers/valid/{Heap.scala => Heaps.scala} (100%) rename src/test/resources/regression/verification/purescala/valid/{BVDivSemantic.scala => BVDivSemantics.scala} (100%) rename src/test/resources/regression/verification/purescala/valid/{Generics2.scala => Generics1.scala} (100%) rename src/test/resources/regression/verification/purescala/valid/{Heap.scala => Heaps.scala} (100%) rename src/test/resources/regression/verification/purescala/valid/{TextJustifyNoPost.scala => Justify.scala} (100%) rename src/test/resources/regression/verification/purescala/valid/{MapPlus.scala => MapGetPlus.scala} (100%) diff --git a/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala b/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala index d80fcf4f0..01fb395fd 100644 --- a/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala +++ b/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala @@ -1,7 +1,7 @@ /* Copyright 2009-2014 EPFL, Lausanne */ import leon.lang._ -object Numerals { +object ArrayLiterals { def foo(): Int = { val b : Array[Int] = Array[Int](1,2,3) val a : Array[Int] = Array(1,2,3) diff --git a/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala b/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala index 5d336d01d..046745504 100644 --- a/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala +++ b/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala @@ -2,7 +2,7 @@ import leon.lang._ -object Test { +object ArrayUpdated { def test(a: Array[Int]): Int = { require(a.length > 0) diff --git a/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala b/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala index 0851ba5ad..6d6ec65a3 100644 --- a/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala +++ b/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala @@ -2,7 +2,7 @@ import leon.lang._ import leon.annotation._ import leon._ -object Operators { +object Asserts1 { def foo(a: BigInt): BigInt = { require(a > 0) diff --git a/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala b/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala index bdebd2527..149dd4ac5 100644 --- a/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala +++ b/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala @@ -2,7 +2,7 @@ import leon.lang._ -object FiniteSorting { +object FiniteSort { // These finite sorting functions essentially implement insertion sort. def sort2(x : BigInt, y : BigInt) : (BigInt,BigInt) = { diff --git a/src/test/resources/regression/verification/newsolvers/valid/Generics2.scala b/src/test/resources/regression/verification/newsolvers/valid/Generics1.scala similarity index 100% rename from src/test/resources/regression/verification/newsolvers/valid/Generics2.scala rename to src/test/resources/regression/verification/newsolvers/valid/Generics1.scala diff --git a/src/test/resources/regression/verification/newsolvers/valid/Heap.scala b/src/test/resources/regression/verification/newsolvers/valid/Heaps.scala similarity index 100% rename from src/test/resources/regression/verification/newsolvers/valid/Heap.scala rename to src/test/resources/regression/verification/newsolvers/valid/Heaps.scala diff --git a/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala b/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala index 8dade4ccc..185aad5c9 100644 --- a/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala +++ b/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala @@ -1,5 +1,5 @@ import leon.lang._ -object foo { +object CharCompare { def cmp(c1: Char, c2: Char): Boolean = { c1 < c2 }.holds } diff --git a/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala b/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala index d0112ebc7..34850fe4f 100644 --- a/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala +++ b/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala @@ -1,7 +1,8 @@ /* Copyright 2009-2015 EPFL, Lausanne */ import leon.lang._ -object Numerals { + +object ArrayLiterals { def foo(): Int = { val b : Array[Int] = Array[Int](1,2,3) val a : Array[Int] = Array(1,2,3) diff --git a/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala b/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala index 897be5acf..e60918b64 100644 --- a/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala +++ b/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala @@ -2,7 +2,7 @@ import leon.lang._ -object Test { +object ArrayUpdated { def test(a: Array[Int]): Int = { require(a.length > 0) diff --git a/src/test/resources/regression/verification/purescala/valid/Asserts1.scala b/src/test/resources/regression/verification/purescala/valid/Asserts1.scala index b8681a6ea..fce6728b6 100644 --- a/src/test/resources/regression/verification/purescala/valid/Asserts1.scala +++ b/src/test/resources/regression/verification/purescala/valid/Asserts1.scala @@ -4,7 +4,7 @@ import leon.lang._ import leon.annotation._ import leon._ -object Operators { +object Asserts1 { def foo(a: BigInt): BigInt = { require(a > 0) diff --git a/src/test/resources/regression/verification/purescala/valid/BVDivSemantic.scala b/src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala similarity index 100% rename from src/test/resources/regression/verification/purescala/valid/BVDivSemantic.scala rename to src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala diff --git a/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala b/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala index d113b27fa..ead4c46cb 100644 --- a/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala +++ b/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala @@ -2,7 +2,7 @@ import leon.lang._ -object FiniteSorting { +object FiniteSort { // These finite sorting functions essentially implement insertion sort. def sort2(x : Int, y : Int) : (Int,Int) = { diff --git a/src/test/resources/regression/verification/purescala/valid/Generics2.scala b/src/test/resources/regression/verification/purescala/valid/Generics1.scala similarity index 100% rename from src/test/resources/regression/verification/purescala/valid/Generics2.scala rename to src/test/resources/regression/verification/purescala/valid/Generics1.scala diff --git a/src/test/resources/regression/verification/purescala/valid/Heap.scala b/src/test/resources/regression/verification/purescala/valid/Heaps.scala similarity index 100% rename from src/test/resources/regression/verification/purescala/valid/Heap.scala rename to src/test/resources/regression/verification/purescala/valid/Heaps.scala diff --git a/src/test/resources/regression/verification/purescala/valid/TextJustifyNoPost.scala b/src/test/resources/regression/verification/purescala/valid/Justify.scala similarity index 100% rename from src/test/resources/regression/verification/purescala/valid/TextJustifyNoPost.scala rename to src/test/resources/regression/verification/purescala/valid/Justify.scala diff --git a/src/test/resources/regression/verification/purescala/valid/MapPlus.scala b/src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala similarity index 100% rename from src/test/resources/regression/verification/purescala/valid/MapPlus.scala rename to src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala -- GitLab