Merge pull request #19 from mandar2812/branch-1.4.x

Merging Branch 1.4.x

Author: mandar2812

.gitignore

@@ -12,6 +12,9 @@ build/*.jar
 .settings
 .cache
 target/*
+dynaml-core/target/*
+dynaml-examples/target/*
+dynaml-pipes/target/*
 .DS_Store
 release.properties
 *.log

README.md

@@ -1,6 +1,8 @@
 import sbt._
 import java.io.File
 
+import sbtbuildinfo.BuildInfoPlugin.autoImport._
+
 maintainer := "Mandar Chandorkar <[email protected]>"
 
 packageSummary := "Scala Library/REPL for Machine Learning Research"
@@ -10,16 +12,17 @@ packageDescription := "DynaML is a scala library/repl for implementing and worki
   "which can be extended easily to implement advanced models for small and large scale applications.\n\n"+
   "But the library can also be used as an educational/research tool for data analysis."
 
+val mainVersion = "v1.4-beta.8"
+
 val dataDirectory = settingKey[File]("The directory holding the data files for running example scripts")
 
-lazy val commonSettings = Seq(
-  name := "DynaML",
+val baseSettings = Seq(
   organization := "io.github.mandar2812",
-  version := "v1.4-beta.7",
   scalaVersion in ThisBuild := "2.11.7",
-  mainClass in Compile := Some("io.github.mandar2812.dynaml.DynaML"),
-  fork in run := true,
-  resolvers in ThisBuild ++= Seq("jzy3d-releases" at "http://maven.jzy3d.org/releases"),
+  resolvers in ThisBuild ++= Seq("jzy3d-releases" at "http://maven.jzy3d.org/releases")
+)
+
+lazy val commonSettings = Seq(
   libraryDependencies ++= Seq(
     "org.scala-lang" % "scala-compiler" % scalaVersion.value % "compile",
     "org.scala-lang" % "scala-library" % scalaVersion.value % "compile",
@@ -42,15 +45,42 @@ lazy val commonSettings = Seq(
     "com.quantifind" % "wisp_2.11" % "0.0.4" % "compile",
     "org.jzy3d" % "jzy3d-api" % "0.9.1" % "compile",
     "com.lihaoyi" % "ammonite-repl_2.11.7" % "0.5.8"
-  ),
-  dataDirectory := new File("data/"),
-  initialCommands in console := """io.github.mandar2812.dynaml.DynaML.run(banner="""" +
-    target.value.getPath + """/universal/stage/conf/banner.txt");"""
+  )
 )
 
+lazy val pipes = (project in file("dynaml-pipes")).settings(baseSettings:_*)
+  .settings(
+    name := "dynaml-pipes",
+    version := "1.0"
+  )
+
+lazy val core = (project in file("dynaml-core")).settings(baseSettings)
+  .settings(commonSettings:_*)
+  .enablePlugins(JavaAppPackaging, BuildInfoPlugin)
+  .dependsOn(pipes)
+  .settings(
+    name := "dynaml-core",
+    version := mainVersion
+  )
+
+lazy val examples = (project in file("dynaml-examples"))
+  .settings(baseSettings:_*)
+  .settings(commonSettings:_*)
+  .settings(
+    name := "dynaml-examples",
+    version := "1.0"
+  ).dependsOn(pipes, core)
+
 lazy val DynaML = (project in file(".")).enablePlugins(JavaAppPackaging, BuildInfoPlugin)
+  .settings(baseSettings:_*)
   .settings(commonSettings: _*)
+  .dependsOn(core, examples, pipes)
   .settings(
+    //aggregate in update := false,
+    name := "DynaML",
+    version := mainVersion,
+    fork in run := true,
+    mainClass in Compile := Some("io.github.mandar2812.dynaml.DynaML"),
     buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
     buildInfoPackage := "io.github.mandar2812.dynaml.repl",
     buildInfoUsePackageAsPath := true,
@@ -67,6 +97,10 @@ lazy val DynaML = (project in file(".")).enablePlugins(JavaAppPackaging, BuildIn
       // -J params will be added as jvm parameters
       "-J-Xmx2048m",
       "-J-Xms64m"
-    )
-  )
+    ),
+    dataDirectory := new File("data/"),
+    initialCommands in console := """io.github.mandar2812.dynaml.DynaML.run(banner="""" +
+      target.value.getPath + """/universal/stage/conf/banner.txt");"""
+
+)
 

build.sbt

@@ -1,35 +1,14 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-* */
-package io.github.mandar2812.dynaml.pipes
+package io.github.mandar2812.dynaml
 
+import scala.collection.mutable.{MutableList => ML}
 import breeze.linalg.DenseVector
 import io.github.mandar2812.dynaml.evaluation.RegressionMetrics
 import io.github.mandar2812.dynaml.models.ParameterizedLearner
 import io.github.mandar2812.dynaml.models.gp.AbstractGPRegressionModel
-import io.github.mandar2812.dynaml.optimization.{
-CoupledSimulatedAnnealing, GPMLOptimizer,
-GloballyOptWithGrad, GridSearch}
-import io.github.mandar2812.dynaml.utils
+import io.github.mandar2812.dynaml.optimization.{CoupledSimulatedAnnealing, GPMLOptimizer, GloballyOptWithGrad, GridSearch}
+import io.github.mandar2812.dynaml.pipes.{DataPipe, StreamDataPipe}
 import org.apache.log4j.Logger
 
-import scala.collection.mutable.{MutableList => ML}
-
 /**
   * @author mandar2812 datum 3/2/16.
   *
@@ -325,7 +304,7 @@ object DynaMLPipe {
     * Takes a base pipe and creates a parallel pipe by duplicating it.
     *
     * @param pipe The base data pipe
-    * @return a [[ParallelPipe]] object.
+    * @return a [[io.github.mandar2812.dynaml.pipes.ParallelPipe]] object.
     * */
   def duplicate[Source, Destination](pipe: DataPipe[Source, Destination]) =
     DataPipe(pipe, pipe)

src/main/scala/io/github/mandar2812/dynaml/pipes/DynaMLPipe.scala renamed to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/DynaMLPipe.scala

@@ -16,7 +16,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 * */
-package io.github.mandar2812.dynaml.graphutils
+package io.github.mandar2812.dynaml.graph
 
 import com.tinkerpop.frames.{Property, OutVertex, InVertex, EdgeFrame}