Upgrade Dsl.scala, and test eager execution in nested function calls

Author: Atry

plugins-CumulativeFloatLayers/build.sbt

@@ -11,6 +11,6 @@ libraryDependencies += "com.thoughtworks.each" %% "each" % "3.3.1" % Test
 
 scalacOptions += "-Ypartial-unification"
 
-addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.0.0-RC9")
+addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.0.0-RC10")
 
-addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.0.0-RC9")
+addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.0.0-RC10")

plugins-CumulativeFloatLayers/src/test/scala/com/thoughtworks/deeplearning/plugins/CumulativeFloatLayersSpec.scala

@@ -390,12 +390,8 @@ final class CumulativeFloatLayersSpec
     val weight = hyperparameters.FloatWeight(1.0f)
 
     def myNetwork(input: Float): hyperparameters.FloatLayer = {
-      // FIXME: inlining !-notation does not compile due to https://github.com/ThoughtWorksInc/Dsl.scala/issues/119
-      // 6.7f + !(input + weight) + weight + 5.5f
-
-      val f = !(input + weight)
-      6.7f + f + weight + 5.5f
-    }: @com.thoughtworks.dsl.Dsl.reset
+      6.7f + !(input + weight) + weight + 5.5f
+    }
 
     def train(inputData: Float): Future[Float] = {
       myNetwork(inputData).train

plugins-EagerExecution/build.sbt

@@ -1,10 +1,10 @@
-libraryDependencies += "com.thoughtworks.dsl" %% "dsl" % "1.0.0-RC9"
+libraryDependencies += "com.thoughtworks.dsl" %% "dsl" % "1.0.0-RC10"
 
-libraryDependencies += "com.thoughtworks.dsl" %% "domains-scalaz" % "1.0.0-RC9" % Test
+libraryDependencies += "com.thoughtworks.dsl" %% "domains-scalaz" % "1.0.0-RC10" % Test
 
-addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.0.0-RC9")
+addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-bangnotation" % "1.0.0-RC10")
 
-addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.0.0-RC9")
+addCompilerPlugin("com.thoughtworks.dsl" %% "compilerplugins-reseteverywhere" % "1.0.0-RC10")
 
 fork in Test := true
 

plugins-Layers/build.sbt

@@ -6,4 +6,4 @@ libraryDependencies += "com.thoughtworks.feature" %% "implicitapply" % "2.3.0-M8
 
 libraryDependencies += "com.thoughtworks.feature" %% "factory" % "2.3.0-M8"
 
-libraryDependencies += "com.thoughtworks.dsl" %% "dsl" % "1.0.0-RC9"
+libraryDependencies += "com.thoughtworks.dsl" %% "dsl" % "1.0.0-RC10"