Add versioning system for different versions of code

Later on this will allow us to select the algorithm from the command
line and compare performance easily.

2 files changed, 32 insertions, 21 deletions

diff --git a/src/test/scala/uk/ac/ox/cs/rsacomb/SuiteAll.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/SuiteAll.scala
index 2162f8c..f32c088 100644
--- a/src/test/scala/uk/ac/ox/cs/rsacomb/SuiteAll.scala
+++ b/src/test/scala/uk/ac/ox/cs/rsacomb/SuiteAll.scala
@@ -2,16 +2,25 @@ package uk.ac.ox.cs.rsacomb
 
 import org.scalatest.Suites
 
-import uk.ac.ox.cs.rsacomb.converter.{OWLAxiomSpec, OWLClassSpec, RDFoxConverterSpec}
-import uk.ac.ox.cs.rsacomb.sparql.{ConjunctiveQueryAnswerSpec, ConjunctiveQuerySpec}
+import uk.ac.ox.cs.rsacomb.converter.{
+  OWLAxiomSpec,
+  OWLClassSpec,
+  RDFoxConverterSpec
+}
+import uk.ac.ox.cs.rsacomb.filtering.NaiveFilteringProgramSpec
+import uk.ac.ox.cs.rsacomb.sparql.{
+  ConjunctiveQueryAnswerSpec,
+  ConjunctiveQuerySpec
+}
 
-class SuiteAll extends Suites (
-    new Ontology1_CanonicalModelSpec,
-    new Ontology2_CanonicalModelSpec,
-    new FilteringProgramSpec,
-    new OWLAxiomSpec,
-    new OWLClassSpec,
-    new RDFoxConverterSpec,
-    new ConjunctiveQueryAnswerSpec,
-    new ConjunctiveQuerySpec
-)
+class SuiteAll
+    extends Suites(
+      new Ontology1_CanonicalModelSpec,
+      new Ontology2_CanonicalModelSpec,
+      new NaiveFilteringProgramSpec,
+      new OWLAxiomSpec,
+      new OWLClassSpec,
+      new RDFoxConverterSpec,
+      new ConjunctiveQueryAnswerSpec,
+      new ConjunctiveQuerySpec
+    )
diff --git a/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala b/src/test/scala/uk/ac/ox/cs/rsacomb/filtering/FilteringProgramSpecs.scala
index 32ef8da..372b78c 100644
--- a/src/test/scala/uk/ac/ox/cs/rsacomb/FilteringProgramSpecs.scala
+++ b/src/test/scala/uk/ac/ox/cs/rsacomb/filtering/FilteringProgramSpecs.scala
@@ -1,12 +1,14 @@
-package uk.ac.ox.cs.rsacomb
+package uk.ac.ox.cs.rsacomb.filtering
 
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import tech.oxfordsemantic.jrdfox.logic.expression.IRI
-import uk.ac.ox.cs.rsacomb.FilteringProgram
+import uk.ac.ox.cs.rsacomb.filtering.{FilteringProgram, FilterType}
 import uk.ac.ox.cs.rsacomb.sparql.ConjunctiveQuery
 
-object FilteringProgramSpec {
+object NaiveFilteringProgramSpec {
+
+  val naive: FilterType = FilterType.FILTER_NAIVE
 
   val constants =
     List(IRI.create("_:iri1"), IRI.create("_:iri2"), IRI.create("_:iri3"))
@@ -61,31 +63,31 @@ object FilteringProgramSpec {
   """
 }
 
-class FilteringProgramSpec extends AnyFlatSpec with Matchers {
+class NaiveFilteringProgramSpec extends AnyFlatSpec with Matchers {
 
-  import FilteringProgramSpec._
+  import NaiveFilteringProgramSpec._
 
   "CQ 0" should "generate 27 rules and 3 facts" in {
     val cq = ConjunctiveQuery.parse(cq0).get
-    val filter = FilteringProgram(cq)
+    val filter = FilteringProgram(naive)(cq)
     filter.rules should have length 27
   }
 
   "CQ 1" should "generate 15 rules" in {
     val cq = ConjunctiveQuery.parse(cq1).get
-    val filter = FilteringProgram(cq)
+    val filter = FilteringProgram(naive)(cq)
     filter.rules should have length 15
   }
 
   "CQ 2" should "generate 51 rules" in {
     val cq = ConjunctiveQuery.parse(cq2).get
-    val filter = FilteringProgram(cq)
+    val filter = FilteringProgram(naive)(cq)
     filter.rules should have length 51
   }
 
   "BCQ 0" should "generate 46 rules" in {
     val cq = ConjunctiveQuery.parse(bcq0).get
-    val filter = FilteringProgram(cq)
+    val filter = FilteringProgram(naive)(cq)
     filter.rules should have length 43
   }