Too much fun. Added M8 with Power and Copy operation. For now, interpreter can only work if final evolution step has an operation. This can be cleaned up by incorporating type names when no op is defined.

heineman · heineman · commit 005145f354cd · 2019-06-26T22:54:29.000-04:00
diff --git a/domain/math/src/main/scala/org/combinators/ep/domain/math/M5.scala b/domain/math/src/main/scala/org/combinators/ep/domain/math/M5.scala
@@ -42,8 +42,6 @@ trait M5 extends Evolution {
                                    new BinaryInst(Add, LitInst(0.0), LitInst(7.0)))
 
 
-  new Leaf(2.0)
-
   val treeSimplified = new Node(Seq(new Leaf(2.0), new Leaf(7.0)), Mult.name.hashCode)
   /**
     * Special test case for same queries.
diff --git a/domain/math/src/main/scala/org/combinators/ep/domain/math/M8.scala b/domain/math/src/main/scala/org/combinators/ep/domain/math/M8.scala
@@ -0,0 +1,35 @@
+package org.combinators.ep.domain.math    /*DD:LI:AI*/
+
+import org.combinators.ep.domain.Evolution
+import org.combinators.ep.domain.tree.{Leaf, Node}
+
+trait M8 extends Evolution {
+  self: M0 with M1 with M2 with M3 with M4 with M5 with M6 with M7 =>
+  val domain:MathDomain
+  import domain._
+
+  // SquareRoot of inner value, and an operation Find that counts the number
+  case object Power extends Binary("Power")
+  case object Copy extends ProducerOperation("copy")
+
+  val m8 = Model("m8", Seq(Power), Seq(Copy), last = m7)
+
+  override def getModel = m8
+
+  val m8_1 = new BinaryInst(Power, LitInst(6.0), LitInst(2.0))
+  val m8_2 = new BinaryInst(Power, LitInst(25.0), LitInst(-0.5))
+  val m8_3 = new BinaryInst(Power, LitInst(10.0), LitInst(0.0))
+
+  val m8_tree = new BinaryInst(Mult, LitInst(2.0), new UnaryInst(Sqrt, LitInst(7.0)))
+  val m8_tree1 = new Node(Seq(new Leaf(2.0), new Node(Seq(new Leaf(7.0)), Sqrt.name.hashCode)), Mult.name.hashCode)
+
+  def M8_tests:Seq[TestCase] = Seq(
+    EqualsTestCase(m8_1, Eval, ExistsInstance(Double)(36.0)),
+    EqualsTestCase(m8_2, PrettyP, ExistsInstance(String)("Power(25.0,-0.5)")),
+    EqualsTestCase(m8_3, Eval, ExistsInstance(Double)(1.0)),
+
+    EqualsCompositeTestCase(m8_3, Seq((Simplify, Seq.empty), (PrettyP, Seq.empty)), ExistsInstance(String)("1.0")),
+    EqualsCompositeTestCase(m8_tree, Seq((Copy, Seq.empty), (AsTree, Seq.empty)), ExistsInstance(TreeType)(m8_tree1)),
+
+  )
+}
diff --git a/language/cpp/src/main/scala/org/combinators/ep/language/cpp/deployment/oo/build.scala b/language/cpp/src/main/scala/org/combinators/ep/language/cpp/deployment/oo/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.cpp.deployment.oo
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.cpp._
diff --git a/language/cpp/src/main/scala/org/combinators/ep/language/cpp/deployment/visitor/build.scala b/language/cpp/src/main/scala/org/combinators/ep/language/cpp/deployment/visitor/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.cpp.deployment.visitor
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:47 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.cpp._
diff --git a/language/cpp/src/main/scala/org/combinators/ep/language/cpp/deployment/visitorTable/build.scala b/language/cpp/src/main/scala/org/combinators/ep/language/cpp/deployment/visitorTable/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.cpp.deployment.visitorTable
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:47 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.cpp._
diff --git a/language/gj/src/main/scala/org/combinators/ep/language/gj/deployment/wadler/build.scala b/language/gj/src/main/scala/org/combinators/ep/language/gj/deployment/wadler/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.gj.deployment.wadler
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:47 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.gj._
diff --git a/language/haskell/src/main/scala/org/combinators/ep/language/haskell/deployment/alacarte/build.scala b/language/haskell/src/main/scala/org/combinators/ep/language/haskell/deployment/alacarte/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.haskell.deployment.alacarte
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.haskell._
diff --git a/language/haskell/src/main/scala/org/combinators/ep/language/haskell/deployment/grow/build.scala b/language/haskell/src/main/scala/org/combinators/ep/language/haskell/deployment/grow/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.haskell.deployment.grow
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.haskell._
diff --git a/language/haskell/src/main/scala/org/combinators/ep/language/haskell/deployment/straight/build.scala b/language/haskell/src/main/scala/org/combinators/ep/language/haskell/deployment/straight/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.haskell.deployment.straight
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.haskell._
diff --git a/language/java/src/main/java/make/Create.java b/language/java/src/main/java/make/Create.java
@@ -35,6 +35,7 @@ static final String destinationPath(String lang) {
             new Evolution ("M5", "M4"),
             new Evolution ("M6", "M5"),
             new Evolution ("M7", "M6"),
+            new Evolution ("M8", "M7"),
     };
 
     /** Known Variations to generate. */
diff --git a/language/java/src/main/resources/routes b/language/java/src/main/resources/routes
@@ -7,6 +7,7 @@
 ->	/		 org.combinators.ep.language.java.deployment.algebra.M5_Variation
 ->	/		 org.combinators.ep.language.java.deployment.algebra.M6_Variation
 ->	/		 org.combinators.ep.language.java.deployment.algebra.M7_Variation
+->	/		 org.combinators.ep.language.java.deployment.algebra.M8_Variation
 ->	/		 org.combinators.ep.language.java.deployment.algebra.I1_Variation
 ->	/		 org.combinators.ep.language.java.deployment.algebra.I2_Variation
 ->	/		 org.combinators.ep.language.java.deployment.algebra.P1_Variation
@@ -22,6 +23,7 @@
 ->	/		 org.combinators.ep.language.java.deployment.extensibleVisitor.M5_Variation
 ->	/		 org.combinators.ep.language.java.deployment.extensibleVisitor.M6_Variation
 ->	/		 org.combinators.ep.language.java.deployment.extensibleVisitor.M7_Variation
+->	/		 org.combinators.ep.language.java.deployment.extensibleVisitor.M8_Variation
 ->	/		 org.combinators.ep.language.java.deployment.extensibleVisitor.I1_Variation
 ->	/		 org.combinators.ep.language.java.deployment.extensibleVisitor.I2_Variation
 ->	/		 org.combinators.ep.language.java.deployment.extensibleVisitor.P1_Variation
@@ -37,6 +39,7 @@
 ->	/		 org.combinators.ep.language.java.deployment.interpreter.M5_Variation
 ->	/		 org.combinators.ep.language.java.deployment.interpreter.M6_Variation
 ->	/		 org.combinators.ep.language.java.deployment.interpreter.M7_Variation
+->	/		 org.combinators.ep.language.java.deployment.interpreter.M8_Variation
 ->	/		 org.combinators.ep.language.java.deployment.interpreter.I1_Variation
 ->	/		 org.combinators.ep.language.java.deployment.interpreter.I2_Variation
 ->	/		 org.combinators.ep.language.java.deployment.interpreter.P1_Variation
@@ -52,6 +55,7 @@
 ->	/		 org.combinators.ep.language.java.deployment.oo.M5_Variation
 ->	/		 org.combinators.ep.language.java.deployment.oo.M6_Variation
 ->	/		 org.combinators.ep.language.java.deployment.oo.M7_Variation
+->	/		 org.combinators.ep.language.java.deployment.oo.M8_Variation
 ->	/		 org.combinators.ep.language.java.deployment.oo.I1_Variation
 ->	/		 org.combinators.ep.language.java.deployment.oo.I2_Variation
 ->	/		 org.combinators.ep.language.java.deployment.oo.P1_Variation
@@ -67,6 +71,7 @@
 ->	/		 org.combinators.ep.language.java.deployment.trivially.M5_Variation
 ->	/		 org.combinators.ep.language.java.deployment.trivially.M6_Variation
 ->	/		 org.combinators.ep.language.java.deployment.trivially.M7_Variation
+->	/		 org.combinators.ep.language.java.deployment.trivially.M8_Variation
 ->	/		 org.combinators.ep.language.java.deployment.trivially.I1_Variation
 ->	/		 org.combinators.ep.language.java.deployment.trivially.I2_Variation
 ->	/		 org.combinators.ep.language.java.deployment.trivially.P1_Variation
@@ -82,6 +87,7 @@
 ->	/		 org.combinators.ep.language.java.deployment.visitor.M5_Variation
 ->	/		 org.combinators.ep.language.java.deployment.visitor.M6_Variation
 ->	/		 org.combinators.ep.language.java.deployment.visitor.M7_Variation
+->	/		 org.combinators.ep.language.java.deployment.visitor.M8_Variation
 ->	/		 org.combinators.ep.language.java.deployment.visitor.I1_Variation
 ->	/		 org.combinators.ep.language.java.deployment.visitor.I2_Variation
 ->	/		 org.combinators.ep.language.java.deployment.visitor.P1_Variation
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/JavaBinaryMethod.scala b/language/java/src/main/scala/org/combinators/ep/language/java/JavaBinaryMethod.scala
@@ -17,7 +17,7 @@ trait JavaBinaryMethod {
     *
     * @return
     */
-  def helperClasses(): Seq[CompilationUnit] = {
+  def generateHelperClasses(): Seq[CompilationUnit] = {
     val classes =
       Seq(
         JavaParser.parse(getClass.getResourceAsStream("/java-code/Tree.java")),
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/OperationAsMethodGenerator.scala b/language/java/src/main/scala/org/combinators/ep/language/java/OperationAsMethodGenerator.scala
@@ -6,6 +6,7 @@ import org.combinators.ep.domain.ModelDomain
 /**
   * Some solutions have classes that are represented by a base class and then one class for
   * each of the known data types.
+  * @deprecated
   */
 trait OperationAsMethodGenerator {
   val domain:ModelDomain
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/algebra/AlgebraGenerator.scala b/language/java/src/main/scala/org/combinators/ep/language/java/algebra/AlgebraGenerator.scala
@@ -65,7 +65,7 @@ trait AlgebraGenerator extends JavaGenerator with JavaBinaryMethod {
 
     //  binary methods for helper
     val decls:Seq[CompilationUnit] = if (getModel.flatten().hasBinaryMethod) {
-      helperClasses()
+      generateHelperClasses()
     } else {
       Seq.empty
     }
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/deployment/algebra/build.scala b/language/java/src/main/scala/org/combinators/ep/language/java/deployment/algebra/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.java.deployment.algebra
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.java._
@@ -71,6 +71,14 @@ override val gen = new WithDomain(math.MathDomain) with AlgebraGenerator with Al
 class M7_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
 override val gen = new WithDomain(math.MathDomain) with AlgebraGenerator with AlgebraTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7
 }
+/* 
+ * algebra solution in java for M8
+ * 
+ * @group evolutions 
+ */
+class M8_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
+override val gen = new WithDomain(math.MathDomain) with AlgebraGenerator with AlgebraTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7 with e8
+}
 /* 
  * algebra solution in java for I1
  * 
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/deployment/extensibleVisitor/build.scala b/language/java/src/main/scala/org/combinators/ep/language/java/deployment/extensibleVisitor/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.java.deployment.extensibleVisitor
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.java._
@@ -71,6 +71,14 @@ override val gen = new WithDomain(math.MathDomain) with ExtensibleVisitorGenerat
 class M7_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
 override val gen = new WithDomain(math.MathDomain) with ExtensibleVisitorGenerator with ExtensibleVisitorTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7
 }
+/* 
+ * extensibleVisitor solution in java for M8
+ * 
+ * @group evolutions 
+ */
+class M8_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
+override val gen = new WithDomain(math.MathDomain) with ExtensibleVisitorGenerator with ExtensibleVisitorTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7 with e8
+}
 /* 
  * extensibleVisitor solution in java for I1
  * 
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/deployment/interpreter/build.scala b/language/java/src/main/scala/org/combinators/ep/language/java/deployment/interpreter/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.java.deployment.interpreter
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.java._
@@ -71,6 +71,14 @@ override val gen = new WithDomain(math.MathDomain) with InterpreterGenerator wit
 class M7_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
 override val gen = new WithDomain(math.MathDomain) with InterpreterGenerator with InterpreterTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7
 }
+/* 
+ * interpreter solution in java for M8
+ * 
+ * @group evolutions 
+ */
+class M8_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
+override val gen = new WithDomain(math.MathDomain) with InterpreterGenerator with InterpreterTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7 with e8
+}
 /* 
  * interpreter solution in java for I1
  * 
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/deployment/oo/build.scala b/language/java/src/main/scala/org/combinators/ep/language/java/deployment/oo/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.java.deployment.oo
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.java._
@@ -71,6 +71,14 @@ override val gen = new WithDomain(math.MathDomain) with OOGenerator with JUnitTe
 class M7_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
 override val gen = new WithDomain(math.MathDomain) with OOGenerator with JUnitTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7
 }
+/* 
+ * oo solution in java for M8
+ * 
+ * @group evolutions 
+ */
+class M8_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
+override val gen = new WithDomain(math.MathDomain) with OOGenerator with JUnitTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7 with e8
+}
 /* 
  * oo solution in java for I1
  * 
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/deployment/trivially/build.scala b/language/java/src/main/scala/org/combinators/ep/language/java/deployment/trivially/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.java.deployment.trivially
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.java._
@@ -71,6 +71,14 @@ override val gen = new WithDomain(math.MathDomain) with TriviallyGenerator with
 class M7_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
 override val gen = new WithDomain(math.MathDomain) with TriviallyGenerator with TriviallyTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7
 }
+/* 
+ * trivially solution in java for M8
+ * 
+ * @group evolutions 
+ */
+class M8_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
+override val gen = new WithDomain(math.MathDomain) with TriviallyGenerator with TriviallyTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7 with e8
+}
 /* 
  * trivially solution in java for I1
  * 
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/deployment/visitor/build.scala b/language/java/src/main/scala/org/combinators/ep/language/java/deployment/visitor/build.scala
@@ -1,5 +1,5 @@
 package org.combinators.ep.language.java.deployment.visitor
-/* Generated: Thu Jun 13 12:39:16 EDT 2019 */
+/* Generated: Wed Jun 26 17:53:46 EDT 2019 */
 import org.combinators.ep.domain.math._
 import org.combinators.ep.domain._
 import org.combinators.ep.language.java._
@@ -71,6 +71,14 @@ override val gen = new WithDomain(math.MathDomain) with VisitorGenerator with JU
 class M7_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
 override val gen = new WithDomain(math.MathDomain) with VisitorGenerator with JUnitTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7
 }
+/* 
+ * visitor solution in java for M8
+ * 
+ * @group evolutions 
+ */
+class M8_Variation @Inject()(web: WebJarsUtil, app: ApplicationLifecycle) extends Foundation(web, app) {
+override val gen = new WithDomain(math.MathDomain) with VisitorGenerator with JUnitTestGenerator with e0 with e1 with e2 with e3 with e4 with e5 with e6 with e7 with e8
+}
 /* 
  * visitor solution in java for I1
  * 
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/e8.scala b/language/java/src/main/scala/org/combinators/ep/language/java/e8.scala
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/extensibleVisitor/ExtensibleVisitorGenerator.scala b/language/java/src/main/scala/org/combinators/ep/language/java/extensibleVisitor/ExtensibleVisitorGenerator.scala
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/interpreter/InterpreterGenerator.scala b/language/java/src/main/scala/org/combinators/ep/language/java/interpreter/InterpreterGenerator.scala
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/interpreter/InterpreterTestGenerator.scala b/language/java/src/main/scala/org/combinators/ep/language/java/interpreter/InterpreterTestGenerator.scala
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/oo/OOGenerator.scala b/language/java/src/main/scala/org/combinators/ep/language/java/oo/OOGenerator.scala
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/trivially/TriviallyGenerator.scala b/language/java/src/main/scala/org/combinators/ep/language/java/trivially/TriviallyGenerator.scala
diff --git a/language/java/src/main/scala/org/combinators/ep/language/java/visitor/VisitorGenerator.scala b/language/java/src/main/scala/org/combinators/ep/language/java/visitor/VisitorGenerator.scala
diff --git a/language/scala/src/main/scala/org/combinators/ep/language/scala/deployment/functional/build.scala b/language/scala/src/main/scala/org/combinators/ep/language/scala/deployment/functional/build.scala
diff --git a/language/scala/src/main/scala/org/combinators/ep/language/scala/deployment/oo/build.scala b/language/scala/src/main/scala/org/combinators/ep/language/scala/deployment/oo/build.scala
diff --git a/language/scala/src/main/scala/org/combinators/ep/language/scala/deployment/straight/build.scala b/language/scala/src/main/scala/org/combinators/ep/language/scala/deployment/straight/build.scala
