Commit e8ad3f70 authored by Arthur Bit-Monnot's avatar Arthur Bit-Monnot

Drop landscaper dependency

parent 3a6380e3
......@@ -62,19 +62,19 @@ package object analysis {
}
/** Returns a set of fluent templates on which the given action has an effect. */
def affectedBy(a: ActionTemplate): Set[FluentTemplate] = {
val extractor = landscaper.pattern {
case x: TimedAssertion with ProvidesChange => Seq(x.fluent.template)
}
??? // landscaper.extract(extractor, a).toSet
def affectedBy(a: ActionTemplate): Set[FluentTemplate] = { ???
// val extractor = landscaper.pattern {
// case x: TimedAssertion with ProvidesChange => Seq(x.fluent.template)
// }
// landscaper.extract(extractor, a).toSet
}
/** Returns a set of fluent templates on which the given action has a condition. */
def conditionedBy(a: ActionTemplate): Set[FluentTemplate] = {
val extractor = landscaper.pattern {
case x: TimedAssertion with RequiresSupport => Seq(x.fluent.template)
}
??? // landscaper.extract(extractor, a).toSet
def conditionedBy(a: ActionTemplate): Set[FluentTemplate] = { ???
// val extractor = landscaper.pattern {
// case x: TimedAssertion with RequiresSupport => Seq(x.fluent.template)
// }
// landscaper.extract(extractor, a).toSet
}
/** Computes an abstraction hierarchy, has defined by Knoblock.
......
......@@ -5,7 +5,6 @@ import org.scalatest.FunSuite
class ActionInstantiationTest extends FunSuite {
import copla.lang.model.core._
import landscaper._
import copla.lang
......@@ -26,7 +25,7 @@ class ActionInstantiationTest extends FunSuite {
assert(instance.name == name)
// check that the name template has disappeared
val stringWithAPattern = pattern { case x: String if x.contains("Template") => Seq(x) }
// val stringWithAPattern = pattern { case x: String if x.contains("Template") => Seq(x) }
// assert(landscaper.extract(stringWithAPattern, instance.content).isEmpty) // TODO
assert(instance.args.size == act.args.size)
......
......@@ -2,7 +2,7 @@ name := "dahu"
lazy val commonSettings = Seq(
organization := "com.github.arthur-bit-monnot",
scalaVersion := "2.12.5",
scalaVersion := "2.12.6",
crossPaths := true,
// To sync with Maven central
publishMavenStyle := true,
......@@ -36,6 +36,7 @@ lazy val commonSettings = Seq(
// experimental option to speed up the build
"-Ycache-plugin-class-loader:last-modified",
"-Ycache-macro-class-loader:last-modified",
"-Ybackend-parallelism", "3"
// "-opt:simplify-jumps",
// "-opt:compact-locals",
// "-opt:copy-propagation",
......@@ -55,7 +56,7 @@ lazy val root = project
.in(file("."))
.aggregate(utils, recursion, model, solvers, benchmarks, anml)
.settings(
scalaVersion := "2.12.5",
scalaVersion := "2.12.6",
publish := {},
publishLocal := {}
)
......@@ -67,8 +68,7 @@ lazy val anml = project
.settings(libraryDependencies ++= Seq(
"com.lihaoyi" %% "fastparse" % "1.0.0",
"com.github.scopt" %% "scopt" % "3.7.0",
"com.github.arthur-bit-monnot" %% "landscaper" % "0.1.2",
"com.propensive" %% "magnolia" % "0.7.1",
"com.chuusai" %% "shapeless" % "2.3.3",
"org.scalatest" %% "scalatest" % "3.0.5" % "test"
))
......
......@@ -42,8 +42,7 @@ object anml extends Module {
def ivyDeps = Agg(
ivy"com.lihaoyi::fastparse:1.0.0",
ivy"com.github.scopt::scopt:3.7.0",
ivy"com.github.arthur-bit-monnot::landscaper:0.1.2",
ivy"com.propensive::magnolia:0.7.1"
ivy"com.chuusai::shapeless:2.3.3"
)
object tests extends Tests {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment