From e67b4ea5c65dfbfa666c0fbb7f152498f701d1d7 Mon Sep 17 00:00:00 2001 From: mandar2812 Date: Wed, 15 Jun 2016 12:16:49 +0200 Subject: [PATCH 1/4] Moving around classes/packages [1] --- .../io/github/mandar2812/dynaml/DynaML.scala | 2 +- .../dynaml/{pipes => }/DynaMLPipe.scala | 4 +- .../dynaml/examples/AbottPowerPlant.scala | 3 +- .../dynaml/examples/AbottPowerPlantNN.scala | 3 +- .../dynaml/examples/DaisyPowerPlant.scala | 3 +- .../dynaml/examples/LightCurveAGN.scala | 5 +- .../dynaml/examples/SantaFeLaser.scala | 3 +- .../dynaml/examples/TestAdult.scala | 3 +- .../dynaml/examples/TestCommitteeNNOmni.scala | 3 +- .../dynaml/examples/TestGPHousing.scala | 4 +- .../dynaml/examples/TestHousing.scala | 2 +- .../dynaml/examples/TestNNDelve.scala | 3 +- .../dynaml/examples/TestNNHousing.scala | 3 +- .../dynaml/examples/TestNNWineQuality.scala | 2 + .../dynaml/examples/TestRipley.scala | 2 +- .../{graphutils => graph}/CausalEdge.scala | 2 +- .../dynaml/{graphutils => graph}/Label.scala | 2 +- .../dynaml/{graphutils => graph}/Neuron.scala | 2 +- .../{graphutils => graph}/ParamEdge.scala | 2 +- .../{graphutils => graph}/Parameter.scala | 2 +- .../dynaml/{graphutils => graph}/Point.scala | 2 +- .../{graphutils => graph}/Synapse.scala | 2 +- .../mandar2812/dynaml/models/DLSSVMPipe.scala | 22 +++++ .../mandar2812/dynaml/models/GLMPipe.scala | 23 +++++ .../dynaml/models/GPRegressionPipe.scala | 24 ++++++ .../mandar2812/dynaml/models/ModelPipe.scala | 14 ++++ .../models/ensemble/CommitteeModel.scala | 3 +- .../dynaml/models/ensemble/MetaModel.scala | 3 +- .../models/gp/GPCommitteeRegression.scala | 3 +- .../models/neuralnets/AutoEncoder.scala | 2 +- .../models/neuralnets/FFNeuralGraph.scala | 2 +- .../dynaml/models/svm/KernelLSSVMModel.scala | 2 +- .../dynaml/models/svm/LSSVMCommittee.scala | 2 +- .../dynaml/models/svm/LSSVMModel.scala | 2 +- .../dynaml/models/svm/SDLSSVMModel.scala | 2 +- .../dynaml/optimization/BackPropogation.scala | 2 +- .../optimization/ConjugateGradient.scala | 2 +- .../dynaml/optimization/GradientDescent.scala | 2 +- .../mandar2812/dynaml/pipes/ModelPipe.scala | 84 ------------------- .../mandar2812/dynaml/utils/package.scala | 8 +- 40 files changed, 135 insertions(+), 126 deletions(-) rename src/main/scala/io/github/mandar2812/dynaml/{pipes => }/DynaMLPipe.scala (99%) rename src/main/scala/io/github/mandar2812/dynaml/{graphutils => graph}/CausalEdge.scala (96%) rename src/main/scala/io/github/mandar2812/dynaml/{graphutils => graph}/Label.scala (96%) rename src/main/scala/io/github/mandar2812/dynaml/{graphutils => graph}/Neuron.scala (99%) rename src/main/scala/io/github/mandar2812/dynaml/{graphutils => graph}/ParamEdge.scala (95%) rename src/main/scala/io/github/mandar2812/dynaml/{graphutils => graph}/Parameter.scala (96%) rename src/main/scala/io/github/mandar2812/dynaml/{graphutils => graph}/Point.scala (96%) rename src/main/scala/io/github/mandar2812/dynaml/{graphutils => graph}/Synapse.scala (96%) create mode 100644 src/main/scala/io/github/mandar2812/dynaml/models/DLSSVMPipe.scala create mode 100644 src/main/scala/io/github/mandar2812/dynaml/models/GLMPipe.scala create mode 100644 src/main/scala/io/github/mandar2812/dynaml/models/GPRegressionPipe.scala create mode 100644 src/main/scala/io/github/mandar2812/dynaml/models/ModelPipe.scala delete mode 100644 src/main/scala/io/github/mandar2812/dynaml/pipes/ModelPipe.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/DynaML.scala b/src/main/scala/io/github/mandar2812/dynaml/DynaML.scala index 7252aff87..449c94d14 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/DynaML.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/DynaML.scala @@ -188,7 +188,7 @@ object DynaML { |main(${(quotedArgs ++ quotedKwargs).mkString(", ")}) |} """.stripMargin) - }catch{ + } catch { case e: ArgParseException => // For this semi-expected invalid-argument exception, chop off the // irrelevant bits of the stack trace to reveal only the part which diff --git a/src/main/scala/io/github/mandar2812/dynaml/pipes/DynaMLPipe.scala b/src/main/scala/io/github/mandar2812/dynaml/DynaMLPipe.scala similarity index 99% rename from src/main/scala/io/github/mandar2812/dynaml/pipes/DynaMLPipe.scala rename to src/main/scala/io/github/mandar2812/dynaml/DynaMLPipe.scala index 328964086..e24887285 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/pipes/DynaMLPipe.scala +++ b/src/main/scala/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.pipes +package io.github.mandar2812.dynaml import breeze.linalg.DenseVector import io.github.mandar2812.dynaml.evaluation.RegressionMetrics @@ -25,7 +25,7 @@ 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.pipes.{DataPipe, ParallelPipe, StreamDataPipe} import org.apache.log4j.Logger import scala.collection.mutable.{MutableList => ML} diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlant.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlant.scala index b46677607..2924cf160 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlant.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlant.scala @@ -20,11 +20,12 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.{DenseMatrix, DenseVector} import com.quantifind.charts.Highcharts._ +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.kernels.CovarianceFunction import io.github.mandar2812.dynaml.models.gp.GPNarXModel import io.github.mandar2812.dynaml.optimization.{GPMLOptimizer, GridSearch} -import io.github.mandar2812.dynaml.pipes.{StreamDataPipe, DynaMLPipe, DataPipe} +import io.github.mandar2812.dynaml.pipes.{DataPipe, StreamDataPipe} import org.apache.log4j.Logger /** diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala index 27e72e3e9..a29d17529 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala @@ -20,9 +20,10 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.DenseVector import com.quantifind.charts.Highcharts._ +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.models.neuralnets.{FFNeuralGraph, FeedForwardNetwork} -import io.github.mandar2812.dynaml.pipes.{StreamDataPipe, DynaMLPipe, DataPipe} +import io.github.mandar2812.dynaml.pipes.{DataPipe, StreamDataPipe} import org.apache.log4j.Logger import scala.collection.mutable.{MutableList => ML} diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala index 2cbaa2bc6..8d4c8a9ba 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala @@ -20,11 +20,12 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.{DenseMatrix, DenseVector} import com.quantifind.charts.Highcharts._ +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.kernels.{CovarianceFunction, LocalSVMKernel} import io.github.mandar2812.dynaml.models.svm.DLSSVM import io.github.mandar2812.dynaml.optimization.{GPMLOptimizer, GridSearch} -import io.github.mandar2812.dynaml.pipes.{StreamDataPipe, DynaMLPipe, DataPipe} +import io.github.mandar2812.dynaml.pipes.{DataPipe, StreamDataPipe} import org.apache.log4j.Logger /** diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala index 682be8042..92938f54c 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala @@ -20,11 +20,12 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.{DenseMatrix, DenseVector} import com.quantifind.charts.Highcharts._ +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.kernels.CovarianceFunction -import io.github.mandar2812.dynaml.models.gp.{GPTimeSeries, GPRegression, GPNarModel} +import io.github.mandar2812.dynaml.models.gp.{GPNarModel, GPRegression, GPTimeSeries} import io.github.mandar2812.dynaml.optimization.{GPMLOptimizer, GridSearch} -import io.github.mandar2812.dynaml.pipes.{DynaMLPipe, DataPipe} +import io.github.mandar2812.dynaml.pipes.DataPipe import org.apache.log4j.Logger /** diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala index 1a781472f..80a046ee2 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala @@ -20,11 +20,12 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.{DenseMatrix, DenseVector} import com.quantifind.charts.Highcharts._ +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.kernels.CovarianceFunction import io.github.mandar2812.dynaml.models.gp.GPNarModel import io.github.mandar2812.dynaml.optimization.{GPMLOptimizer, GridSearch} -import io.github.mandar2812.dynaml.pipes.{DynaMLPipe, DataPipe} +import io.github.mandar2812.dynaml.pipes.DataPipe import org.apache.log4j.Logger /** diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestAdult.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/TestAdult.scala index 2ed426909..cc1d92432 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestAdult.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/TestAdult.scala @@ -22,12 +22,13 @@ import java.io.File import breeze.linalg.{DenseMatrix, DenseVector => BDV} import com.github.tototoshi.csv.CSVWriter +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.BinaryClassificationMetrics import org.apache.spark.mllib.regression.LabeledPoint import org.apache.spark.rdd.RDD import org.apache.spark.{SparkConf, SparkContext} import io.github.mandar2812.dynaml.kernels.{RBFKernel, SVMKernel} -import io.github.mandar2812.dynaml.models.KernelizedModel +import io.github.mandar2812.dynaml.models.{GLMPipe, KernelizedModel} import io.github.mandar2812.dynaml.models.lm.GeneralizedLinearModel import io.github.mandar2812.dynaml.models.svm.{KernelSparkModel, LSSVMSparkModel} import io.github.mandar2812.dynaml.pipes._ diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala index 519d16720..80783f946 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala @@ -22,9 +22,10 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.DenseVector import com.quantifind.charts.Highcharts._ +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.models.neuralnets.{CommitteeNetwork, FFNeuralGraph} -import io.github.mandar2812.dynaml.pipes.{DynaMLPipe, DataPipe} +import io.github.mandar2812.dynaml.pipes.DataPipe import org.apache.log4j.Logger /** diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestGPHousing.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/TestGPHousing.scala index 71865ec2b..5eb434437 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestGPHousing.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/TestGPHousing.scala @@ -19,11 +19,13 @@ under the License. package io.github.mandar2812.dynaml.examples import breeze.linalg.{DenseMatrix, DenseVector} +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.kernels._ +import io.github.mandar2812.dynaml.models.GPRegressionPipe import io.github.mandar2812.dynaml.models.gp.GPRegression import io.github.mandar2812.dynaml.optimization.{GPMLOptimizer, GridSearch} -import io.github.mandar2812.dynaml.pipes.{BifurcationPipe, DataPipe, DynaMLPipe, GPRegressionPipe} +import io.github.mandar2812.dynaml.pipes.{BifurcationPipe, DataPipe} /** * Created by mandar on 15/12/15. diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestHousing.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/TestHousing.scala index 3621f117a..16e6c0768 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestHousing.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/TestHousing.scala @@ -2,7 +2,7 @@ package io.github.mandar2812.dynaml.examples import com.tinkerpop.blueprints.Graph import com.tinkerpop.frames.FramedGraph -import io.github.mandar2812.dynaml.graphutils.CausalEdge +import io.github.mandar2812.dynaml.graph.CausalEdge import io.github.mandar2812.dynaml.models.KernelizedModel import io.github.mandar2812.dynaml.models.svm.LSSVMModel diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNDelve.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNDelve.scala index 170ec6993..8c3e0a3a2 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNDelve.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNDelve.scala @@ -20,10 +20,11 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.{DenseVector => BDV} import io.github.mandar2812.dynaml.evaluation.RegressionMetrics +import io.github.mandar2812.dynaml.models.GLMPipe import io.github.mandar2812.dynaml.models.lm.GeneralizedLinearModel import io.github.mandar2812.dynaml.models.neuralnets.{FFNeuralGraph, FeedForwardNetwork} import io.github.mandar2812.dynaml.pipes._ -import io.github.mandar2812.dynaml.utils +import io.github.mandar2812.dynaml.{DynaMLPipe, utils} /** * Created by mandar on 11/1/16. diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNHousing.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNHousing.scala index d8a61e46d..80d489533 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNHousing.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNHousing.scala @@ -19,9 +19,10 @@ under the License. package io.github.mandar2812.dynaml.examples import breeze.linalg.DenseVector +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.models.neuralnets.{FFNeuralGraph, FeedForwardNetwork} -import io.github.mandar2812.dynaml.pipes.{DynaMLPipe, DataPipe} +import io.github.mandar2812.dynaml.pipes.DataPipe /** * Created by mandar on 15/12/15. diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNWineQuality.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNWineQuality.scala index a857a59fb..65688b17a 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNWineQuality.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNWineQuality.scala @@ -19,8 +19,10 @@ under the License. package io.github.mandar2812.dynaml.examples import breeze.linalg.{DenseVector => BDV} +import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.BinaryClassificationMetrics import io.github.mandar2812.dynaml.kernels.LocalSVMKernel +import io.github.mandar2812.dynaml.models.GLMPipe import io.github.mandar2812.dynaml.models.lm.{GeneralizedLinearModel, LogisticGLM, ProbitGLM} import io.github.mandar2812.dynaml.models.neuralnets.{FFNeuralGraph, FeedForwardNetwork} import io.github.mandar2812.dynaml.models.svm.DLSSVM diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestRipley.scala b/src/main/scala/io/github/mandar2812/dynaml/examples/TestRipley.scala index 6d64632d5..dce02f074 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestRipley.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/examples/TestRipley.scala @@ -5,7 +5,7 @@ import java.io.File import com.github.tototoshi.csv.CSVWriter import com.tinkerpop.blueprints.Graph import com.tinkerpop.frames.FramedGraph -import io.github.mandar2812.dynaml.graphutils.CausalEdge +import io.github.mandar2812.dynaml.graph.CausalEdge import io.github.mandar2812.dynaml.models.KernelizedModel import io.github.mandar2812.dynaml.models.svm.LSSVMModel diff --git a/src/main/scala/io/github/mandar2812/dynaml/graphutils/CausalEdge.scala b/src/main/scala/io/github/mandar2812/dynaml/graph/CausalEdge.scala similarity index 96% rename from src/main/scala/io/github/mandar2812/dynaml/graphutils/CausalEdge.scala rename to src/main/scala/io/github/mandar2812/dynaml/graph/CausalEdge.scala index 51593de2d..695cdafd5 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/graphutils/CausalEdge.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/graph/CausalEdge.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} diff --git a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Label.scala b/src/main/scala/io/github/mandar2812/dynaml/graph/Label.scala similarity index 96% rename from src/main/scala/io/github/mandar2812/dynaml/graphutils/Label.scala rename to src/main/scala/io/github/mandar2812/dynaml/graph/Label.scala index 8fd892b2c..bea1795b0 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Label.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/graph/Label.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.blueprints.Direction import com.tinkerpop.frames.{Adjacency, VertexFrame, Property} diff --git a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Neuron.scala b/src/main/scala/io/github/mandar2812/dynaml/graph/Neuron.scala similarity index 99% rename from src/main/scala/io/github/mandar2812/dynaml/graphutils/Neuron.scala rename to src/main/scala/io/github/mandar2812/dynaml/graph/Neuron.scala index 6746ef291..94ab01a52 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Neuron.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/graph/Neuron.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.blueprints.Direction import com.tinkerpop.frames.{Incidence, Property, VertexFrame} diff --git a/src/main/scala/io/github/mandar2812/dynaml/graphutils/ParamEdge.scala b/src/main/scala/io/github/mandar2812/dynaml/graph/ParamEdge.scala similarity index 95% rename from src/main/scala/io/github/mandar2812/dynaml/graphutils/ParamEdge.scala rename to src/main/scala/io/github/mandar2812/dynaml/graph/ParamEdge.scala index 5caca1e78..2425c42cf 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/graphutils/ParamEdge.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/graph/ParamEdge.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.{InVertex, OutVertex, EdgeFrame} diff --git a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Parameter.scala b/src/main/scala/io/github/mandar2812/dynaml/graph/Parameter.scala similarity index 96% rename from src/main/scala/io/github/mandar2812/dynaml/graphutils/Parameter.scala rename to src/main/scala/io/github/mandar2812/dynaml/graph/Parameter.scala index 0c17fce22..f1f191818 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Parameter.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/graph/Parameter.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.blueprints.Direction import com.tinkerpop.frames.{Adjacency, VertexFrame, Property} diff --git a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Point.scala b/src/main/scala/io/github/mandar2812/dynaml/graph/Point.scala similarity index 96% rename from src/main/scala/io/github/mandar2812/dynaml/graphutils/Point.scala rename to src/main/scala/io/github/mandar2812/dynaml/graph/Point.scala index a977d685c..e3c6cd573 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Point.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/graph/Point.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.blueprints.Direction import com.tinkerpop.frames.{Adjacency, VertexFrame, Property} diff --git a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Synapse.scala b/src/main/scala/io/github/mandar2812/dynaml/graph/Synapse.scala similarity index 96% rename from src/main/scala/io/github/mandar2812/dynaml/graphutils/Synapse.scala rename to src/main/scala/io/github/mandar2812/dynaml/graph/Synapse.scala index 4f5529683..7a12869d5 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/graphutils/Synapse.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/graph/Synapse.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, InVertex, OutVertex, EdgeFrame} diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/DLSSVMPipe.scala b/src/main/scala/io/github/mandar2812/dynaml/models/DLSSVMPipe.scala new file mode 100644 index 000000000..2ad2f403c --- /dev/null +++ b/src/main/scala/io/github/mandar2812/dynaml/models/DLSSVMPipe.scala @@ -0,0 +1,22 @@ +package io.github.mandar2812.dynaml.models + +import breeze.linalg.{DenseMatrix, DenseVector} +import io.github.mandar2812.dynaml.kernels.CovarianceFunction +import io.github.mandar2812.dynaml.models.svm.DLSSVM + +/** + * Created by mandar on 15/6/16. + */ +class DLSSVMPipe[Source](pre: (Source) => Stream[(DenseVector[Double], Double)], + cov: CovarianceFunction[DenseVector[Double], Double, DenseMatrix[Double]], + task: String = "regression") extends + ModelPipe[Source, Stream[(DenseVector[Double], Double)], + DenseVector[Double], Double, DLSSVM] { + + override val preProcess = pre + + override def run(data: Source) = { + val training = preProcess(data) + new DLSSVM(training, training.length, cov, task) + } +} diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/GLMPipe.scala b/src/main/scala/io/github/mandar2812/dynaml/models/GLMPipe.scala new file mode 100644 index 000000000..bd88b819c --- /dev/null +++ b/src/main/scala/io/github/mandar2812/dynaml/models/GLMPipe.scala @@ -0,0 +1,23 @@ +package io.github.mandar2812.dynaml.models + +import breeze.linalg.DenseVector +import io.github.mandar2812.dynaml.models.lm.GeneralizedLinearModel + +/** + * Created by mandar on 15/6/16. + */ +class GLMPipe[T, Source](pre: (Source) => Stream[(DenseVector[Double], Double)], + map: (DenseVector[Double]) => (DenseVector[Double]) = identity _, + task: String = "regression", modelType: String = "") extends + ModelPipe[Source, Stream[(DenseVector[Double], Double)], + DenseVector[Double], Double, + GeneralizedLinearModel[T]] { + + override val preProcess = pre + + override def run(data: Source) = { + val training = preProcess(data) + GeneralizedLinearModel[T](training, task, map, modelType) + } + +} diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/GPRegressionPipe.scala b/src/main/scala/io/github/mandar2812/dynaml/models/GPRegressionPipe.scala new file mode 100644 index 000000000..ee3ff5eed --- /dev/null +++ b/src/main/scala/io/github/mandar2812/dynaml/models/GPRegressionPipe.scala @@ -0,0 +1,24 @@ +package io.github.mandar2812.dynaml.models + +import breeze.linalg.{DenseMatrix, DenseVector} +import io.github.mandar2812.dynaml.kernels.CovarianceFunction +import io.github.mandar2812.dynaml.models.gp.AbstractGPRegressionModel + +/** + * Created by mandar on 15/6/16. + */ +class GPRegressionPipe[M <: +AbstractGPRegressionModel[Seq[(DenseVector[Double], Double)], + DenseVector[Double]], Source](pre: (Source) => Seq[(DenseVector[Double], Double)], + cov: CovarianceFunction[DenseVector[Double], Double, DenseMatrix[Double]], + n: CovarianceFunction[DenseVector[Double], Double, DenseMatrix[Double]], + order: Int = 0, ex: Int = 0) + extends ModelPipe[Source, Seq[(DenseVector[Double], Double)], + DenseVector[Double], Double, M] { + + override val preProcess: (Source) => Seq[(DenseVector[Double], Double)] = pre + + override def run(data: Source): M = + AbstractGPRegressionModel[M](preProcess(data), cov, n, order, ex) + +} diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/ModelPipe.scala b/src/main/scala/io/github/mandar2812/dynaml/models/ModelPipe.scala new file mode 100644 index 000000000..2d4d46efb --- /dev/null +++ b/src/main/scala/io/github/mandar2812/dynaml/models/ModelPipe.scala @@ -0,0 +1,14 @@ +package io.github.mandar2812.dynaml.models + +import io.github.mandar2812.dynaml.pipes.DataPipe + +/** + * Top level trait for Pipes involving ML models. + */ +trait ModelPipe[Source, T, Q, R, M <: Model[T, Q, R]] + extends DataPipe[Source, M]{ + + val preProcess: (Source) => T + + override def run(data: Source): M +} diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/CommitteeModel.scala b/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/CommitteeModel.scala index ab7b3dea0..9ea880f53 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/CommitteeModel.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/CommitteeModel.scala @@ -21,8 +21,7 @@ package io.github.mandar2812.dynaml.models.ensemble import breeze.linalg.DenseVector import io.github.mandar2812.dynaml.models.gp.GPRegression import io.github.mandar2812.dynaml.models.neuralnets.FeedForwardNetwork -import io.github.mandar2812.dynaml.models.{LinearModel, Model} -import io.github.mandar2812.dynaml.pipes.ModelPipe +import io.github.mandar2812.dynaml.models.{LinearModel, Model, ModelPipe} /** * Defines an abstract implementation of a "committee-model". diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/MetaModel.scala b/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/MetaModel.scala index e8282d0db..8fdb6a837 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/MetaModel.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/MetaModel.scala @@ -19,10 +19,9 @@ under the License. package io.github.mandar2812.dynaml.models.ensemble import breeze.linalg.DenseVector -import io.github.mandar2812.dynaml.models.Model +import io.github.mandar2812.dynaml.models.{Model, ModelPipe} import io.github.mandar2812.dynaml.models.gp.GPRegression import io.github.mandar2812.dynaml.models.neuralnets.FeedForwardNetwork -import io.github.mandar2812.dynaml.pipes.ModelPipe /** * diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/GPCommitteeRegression.scala b/src/main/scala/io/github/mandar2812/dynaml/models/gp/GPCommitteeRegression.scala index 83036f4c6..e1bb782e4 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/models/gp/GPCommitteeRegression.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/models/gp/GPCommitteeRegression.scala @@ -19,8 +19,7 @@ under the License. package io.github.mandar2812.dynaml.models.gp import breeze.linalg.DenseVector -import io.github.mandar2812.dynaml.models.LinearModel -import io.github.mandar2812.dynaml.pipes.GPRegressionPipe +import io.github.mandar2812.dynaml.models.{GPRegressionPipe, LinearModel} /** * Created by mandar on 9/2/16. diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/AutoEncoder.scala b/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/AutoEncoder.scala index 41e1bcd29..7c1edcd0c 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/AutoEncoder.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/AutoEncoder.scala @@ -19,7 +19,7 @@ under the License. package io.github.mandar2812.dynaml.models.neuralnets import breeze.linalg.DenseVector -import io.github.mandar2812.dynaml.pipes.ModelPipe +import io.github.mandar2812.dynaml.models.ModelPipe /** * Created by mandar on 23/2/16. diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/FFNeuralGraph.scala b/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/FFNeuralGraph.scala index 7a85b6956..a549e19e5 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/FFNeuralGraph.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/FFNeuralGraph.scala @@ -21,7 +21,7 @@ package io.github.mandar2812.dynaml.models.neuralnets import breeze.linalg.DenseVector import com.tinkerpop.blueprints.{GraphFactory, Graph} import com.tinkerpop.frames.{FramedGraphFactory, FramedGraph} -import io.github.mandar2812.dynaml.graphutils.{Neuron, Synapse} +import io.github.mandar2812.dynaml.graph.{Neuron, Synapse} import org.apache.log4j.Logger import scala.collection.JavaConversions diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/KernelLSSVMModel.scala b/src/main/scala/io/github/mandar2812/dynaml/models/svm/KernelLSSVMModel.scala index b1304f5f5..f4f5d9afc 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/models/svm/KernelLSSVMModel.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/models/svm/KernelLSSVMModel.scala @@ -19,7 +19,7 @@ package io.github.mandar2812.dynaml.models.svm import breeze.linalg.{DenseMatrix, DenseVector, norm} import com.tinkerpop.blueprints.Graph import com.tinkerpop.frames.FramedGraph -import io.github.mandar2812.dynaml.graphutils.{CausalEdge, Parameter, Point} +import io.github.mandar2812.dynaml.graph.{CausalEdge, Parameter, Point} import io.github.mandar2812.dynaml.kernels.{GaussianDensityKernel, RBFKernel, SVMKernel} import io.github.mandar2812.dynaml.models.KernelizedModel import io.github.mandar2812.dynaml.optimization.ConjugateGradient diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMCommittee.scala b/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMCommittee.scala index 6ba7004f3..48465908b 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMCommittee.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMCommittee.scala @@ -1,9 +1,9 @@ package io.github.mandar2812.dynaml.models.svm import breeze.linalg.DenseVector +import io.github.mandar2812.dynaml.models.DLSSVMPipe import io.github.mandar2812.dynaml.models.ensemble.CommitteeModel import io.github.mandar2812.dynaml.optimization.{GlobalOptimizer, GridSearch, RDDCommitteeSolver, RegularizedOptimizer} -import io.github.mandar2812.dynaml.pipes.DLSSVMPipe import org.apache.spark.rdd.RDD /** diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMModel.scala b/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMModel.scala index 8c54d9ce6..1a1a473b0 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMModel.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMModel.scala @@ -8,7 +8,7 @@ import com.tinkerpop.blueprints.util.io.graphson.GraphSONWriter import com.tinkerpop.blueprints.{Graph, GraphFactory} import com.tinkerpop.frames.{FramedGraph, FramedGraphFactory} import io.github.mandar2812.dynaml.evaluation.Metrics -import io.github.mandar2812.dynaml.graphutils.{CausalEdge, Label, ParamEdge, Parameter, _} +import io.github.mandar2812.dynaml.graph.{CausalEdge, Label, ParamEdge, Parameter, _} import io.github.mandar2812.dynaml.optimization._ import io.github.mandar2812.dynaml.utils import org.apache.log4j.{Logger, Priority} diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/SDLSSVMModel.scala b/src/main/scala/io/github/mandar2812/dynaml/models/svm/SDLSSVMModel.scala index 8a1c9fc8c..b9951feef 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/models/svm/SDLSSVMModel.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/models/svm/SDLSSVMModel.scala @@ -4,7 +4,7 @@ import breeze.linalg.{DenseVector, DenseMatrix} import com.tinkerpop.blueprints.{GraphFactory, Graph} import com.tinkerpop.frames.{FramedGraphFactory, FramedGraph} import io.github.mandar2812.dynaml.evaluation.Metrics -import io.github.mandar2812.dynaml.graphutils._ +import io.github.mandar2812.dynaml.graph._ import io.github.mandar2812.dynaml.kernels.SVMKernel import io.github.mandar2812.dynaml.models.SubsampledDualLSSVM import io.github.mandar2812.dynaml.optimization.ConjugateGradient diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/BackPropogation.scala b/src/main/scala/io/github/mandar2812/dynaml/optimization/BackPropogation.scala index 94b15e98f..144ec64ae 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/optimization/BackPropogation.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/optimization/BackPropogation.scala @@ -19,7 +19,7 @@ under the License. package io.github.mandar2812.dynaml.optimization import breeze.linalg.DenseVector -import io.github.mandar2812.dynaml.graphutils.Neuron +import io.github.mandar2812.dynaml.graph.Neuron import io.github.mandar2812.dynaml.models.neuralnets.FFNeuralGraph import org.apache.log4j.Logger diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala b/src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala index 76369356e..6cadc1f38 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala @@ -19,7 +19,7 @@ under the License. package io.github.mandar2812.dynaml.optimization import breeze.linalg._ -import io.github.mandar2812.dynaml.graphutils.CausalEdge +import io.github.mandar2812.dynaml.graph.CausalEdge /** * @author mandar2812 diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescent.scala b/src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescent.scala index 50d9c479c..7ff2e6051 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescent.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescent.scala @@ -19,7 +19,7 @@ under the License. package io.github.mandar2812.dynaml.optimization import breeze.linalg.DenseVector -import io.github.mandar2812.dynaml.graphutils.CausalEdge +import io.github.mandar2812.dynaml.graph.CausalEdge import io.github.mandar2812.dynaml.pipes.DataPipe import org.apache.log4j.{Logger, Priority} diff --git a/src/main/scala/io/github/mandar2812/dynaml/pipes/ModelPipe.scala b/src/main/scala/io/github/mandar2812/dynaml/pipes/ModelPipe.scala deleted file mode 100644 index 9af4c9aa3..000000000 --- a/src/main/scala/io/github/mandar2812/dynaml/pipes/ModelPipe.scala +++ /dev/null @@ -1,84 +0,0 @@ -/* -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 - -import breeze.linalg.{DenseMatrix, DenseVector} -import io.github.mandar2812.dynaml.kernels.CovarianceFunction -import io.github.mandar2812.dynaml.models._ -import io.github.mandar2812.dynaml.models.gp.AbstractGPRegressionModel -import io.github.mandar2812.dynaml.models.lm.GeneralizedLinearModel -import io.github.mandar2812.dynaml.models.svm.{AbstractDualLSSVM, DLSSVM} - -/** - * Top level trait for Pipes involving ML models. - */ -trait ModelPipe[Source, T, Q, R, M <: Model[T, Q, R]] - extends DataPipe[Source, M]{ - - val preProcess: (Source) => T - - override def run(data: Source): M -} - - -class GPRegressionPipe[M <: -AbstractGPRegressionModel[Seq[(DenseVector[Double], Double)], - DenseVector[Double]], Source](pre: (Source) => Seq[(DenseVector[Double], Double)], - cov: CovarianceFunction[DenseVector[Double], Double, DenseMatrix[Double]], - n: CovarianceFunction[DenseVector[Double], Double, DenseMatrix[Double]], - order: Int = 0, ex: Int = 0) - extends ModelPipe[Source, Seq[(DenseVector[Double], Double)], - DenseVector[Double], Double, M] { - - override val preProcess: (Source) => Seq[(DenseVector[Double], Double)] = pre - - override def run(data: Source): M = - AbstractGPRegressionModel[M](preProcess(data), cov, n, order, ex) - -} - -class GLMPipe[T, Source](pre: (Source) => Stream[(DenseVector[Double], Double)], - map: (DenseVector[Double]) => (DenseVector[Double]) = identity _, - task: String = "regression", modelType: String = "") extends - ModelPipe[Source, Stream[(DenseVector[Double], Double)], - DenseVector[Double], Double, - GeneralizedLinearModel[T]] { - - override val preProcess = pre - - override def run(data: Source) = { - val training = preProcess(data) - GeneralizedLinearModel[T](training, task, map, modelType) - } - -} - -class DLSSVMPipe[Source](pre: (Source) => Stream[(DenseVector[Double], Double)], - cov: CovarianceFunction[DenseVector[Double], Double, DenseMatrix[Double]], - task: String = "regression") extends - ModelPipe[Source, Stream[(DenseVector[Double], Double)], - DenseVector[Double], Double, DLSSVM] { - - override val preProcess = pre - - override def run(data: Source) = { - val training = preProcess(data) - new DLSSVM(training, training.length, cov, task) - } -} diff --git a/src/main/scala/io/github/mandar2812/dynaml/utils/package.scala b/src/main/scala/io/github/mandar2812/dynaml/utils/package.scala index c90b8293f..c494a8916 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/utils/package.scala +++ b/src/main/scala/io/github/mandar2812/dynaml/utils/package.scala @@ -124,17 +124,17 @@ package object utils { s: DenseMatrix[Double], i: Int): (DenseVector[Double], DenseMatrix[Double]) = d match { - case Nil => { + case Nil => m :/= i.toDouble s :/= i.toDouble //val m1: DenseVector[Double] = m/i.toDouble (m, s - (m*m.t)) - } - case x :: rest => { + + case x :: rest => getStatsRec(rest, m + x, s + x*x.t, i + 1) - } + } getStatsRec(data.tail, data.head, From 9e7709d9b8c6ef80d08f582521eb77ccb4bac4d9 Mon Sep 17 00:00:00 2001 From: mandar2812 Date: Wed, 15 Jun 2016 16:52:41 +0200 Subject: [PATCH 2/4] Moving DynaML to a multiple module structure 1) Root 2) core 3) pipes 4) examples --- .gitignore | 3 + build.sbt | 55 +++++++++++--- .../github/mandar2812/dynaml/DynaMLPipe.scala | 29 +------ .../BinaryClassificationMetrics.scala | 0 .../BinaryClassificationMetricsSpark.scala | 0 .../dynaml/evaluation/Metrics.scala | 0 .../dynaml/evaluation/RegressionMetrics.scala | 0 .../evaluation/RegressionMetricsSpark.scala | 0 .../mandar2812/dynaml/graph/CausalEdge.scala | 0 .../mandar2812/dynaml/graph/Label.scala | 0 .../mandar2812/dynaml/graph/Neuron.scala | 0 .../mandar2812/dynaml/graph/ParamEdge.scala | 0 .../mandar2812/dynaml/graph/Parameter.scala | 0 .../mandar2812/dynaml/graph/Point.scala | 0 .../mandar2812/dynaml/graph/Synapse.scala | 0 .../dynaml/kernels/AnovaKernel.scala | 0 .../dynaml/kernels/CauchyKernel.scala | 0 .../dynaml/kernels/DensityKernel.scala | 0 .../dynaml/kernels/DiracKernel.scala | 0 .../dynaml/kernels/ExponentialKernel.scala | 0 .../mandar2812/dynaml/kernels/FBMKernel.scala | 0 .../kernels/GaussianDensityKernel.scala | 0 .../dynaml/kernels/IdentityCovFunc.scala | 0 .../mandar2812/dynaml/kernels/Kernel.scala | 0 .../dynaml/kernels/LaplacianKernel.scala | 0 .../dynaml/kernels/LinearKernel.scala | 0 .../dynaml/kernels/PeriodicKernel.scala | 0 .../dynaml/kernels/PolynomialKernel.scala | 0 .../mandar2812/dynaml/kernels/RBFKernel.scala | 0 .../kernels/RationalQuadraticKernel.scala | 0 .../mandar2812/dynaml/kernels/SVMKernel.scala | 0 .../dynaml/kernels/TStudentKernel.scala | 0 .../dynaml/kernels/WaveKernel.scala | 0 .../dynaml/kernels/WaveletKernel.scala | 0 .../mandar2812/dynaml/models/DLSSVMPipe.scala | 0 .../mandar2812/dynaml/models/GLMPipe.scala | 0 .../dynaml/models/GPRegressionPipe.scala | 0 .../mandar2812/dynaml/models/Model.scala | 0 .../mandar2812/dynaml/models/ModelPipe.scala | 0 .../models/ensemble/CommitteeModel.scala | 0 .../dynaml/models/ensemble/MetaModel.scala | 0 .../models/gp/AbstractGPClassification.scala | 0 .../models/gp/AbstractGPRegressionModel.scala | 0 .../models/gp/GPCommitteeRegression.scala | 0 .../dynaml/models/gp/GPNarModel.scala | 0 .../dynaml/models/gp/GPNarXModel.scala | 0 .../dynaml/models/gp/GPRegression.scala | 0 .../dynaml/models/gp/GPTimeSeries.scala | 0 .../models/gp/GaussianProcessModel.scala | 0 .../dynaml/models/gp/LaplaceBinaryGPC.scala | 0 .../models/lm/GeneralizedLinearModel.scala | 0 .../dynaml/models/lm/LogisticGLM.scala | 0 .../dynaml/models/lm/RegularizedGLM.scala | 0 .../models/neuralnets/AutoEncoder.scala | 0 .../models/neuralnets/CommitteeNetwork.scala | 0 .../models/neuralnets/FFNeuralGraph.scala | 0 .../neuralnets/FeedForwardNetwork.scala | 0 .../models/neuralnets/NeuralGraph.scala | 0 .../models/neuralnets/NeuralNetwork.scala | 0 .../models/neuralnets/TransferFunctions.scala | 0 .../dynaml/models/svm/AbstractDualLSSVM.scala | 0 .../mandar2812/dynaml/models/svm/DLSSVM.scala | 0 .../dynaml/models/svm/KernelLSSVMModel.scala | 0 .../dynaml/models/svm/KernelSparkModel.scala | 0 .../dynaml/models/svm/LSSVMCommittee.scala | 0 .../dynaml/models/svm/LSSVMModel.scala | 0 .../dynaml/models/svm/LSSVMSparkModel.scala | 0 .../dynaml/models/svm/LSSVMTurbo.scala | 0 .../dynaml/models/svm/SDLSSVMModel.scala | 0 .../dynaml/optimization/AbstractCSA.scala | 0 .../optimization/AbstractGridSearch.scala | 0 .../dynaml/optimization/BackPropogation.scala | 0 .../optimization/CommitteeModelSolver.scala | 0 .../optimization/ConjugateGradient.scala | 0 .../optimization/ConjugateGradientSpark.scala | 0 .../CoupledSimulatedAnnealing.scala | 0 .../dynaml/optimization/GPMLOptimizer.scala | 0 .../dynaml/optimization/GlobalOptimizer.scala | 0 .../optimization/GloballyOptimizable.scala | 0 .../dynaml/optimization/Gradient.scala | 0 .../dynaml/optimization/GradientDescent.scala | 0 .../optimization/GradientDescentSpark.scala | 0 .../dynaml/optimization/GridSearch.scala | 0 .../optimization/LSSVMLinearSolver.scala | 0 .../optimization/LaplacePosteriorMode.scala | 0 .../dynaml/optimization/Likelihood.scala | 0 .../dynaml/optimization/Optimizer.scala | 0 .../optimization/QuasiNewtonOptimizer.scala | 0 .../optimization/RegularizedLSSolver.scala | 0 .../dynaml/optimization/Updater.scala | 0 .../dynaml/prototype/EntropyMeasure.scala | 0 .../dynaml/prototype/EntropySelector.scala | 0 .../mandar2812/dynaml/prototype/Measure.scala | 0 .../prototype/QuadraticRenyiEntropy.scala | 0 .../dynaml/prototype/SubsetSelector.scala | 0 .../dynaml/utils/MinMaxAccumulator.scala | 0 .../mandar2812/dynaml/utils/package.scala | 0 .../dynaml/examples/AbottPowerPlant.scala | 0 .../dynaml/examples/AbottPowerPlantNN.scala | 4 +- .../dynaml/examples/DaisyPowerPlant.scala | 2 +- .../dynaml/examples/FSExperiment.scala | 1 + .../dynaml/examples/LightCurveAGN.scala | 6 +- .../dynaml/examples/PreprocessAdult.scala | 2 + .../examples/PreprocessForestCover.scala | 0 .../dynaml/examples/PreprocessSusy.scala | 0 .../dynaml/examples/SantaFeLaser.scala | 4 +- .../dynaml/examples/TestAdult.scala | 0 .../dynaml/examples/TestCommitteeNNOmni.scala | 2 - .../dynaml/examples/TestDelve.scala | 2 +- .../dynaml/examples/TestForestCover.scala | 0 .../dynaml/examples/TestGPDelve.scala | 0 .../dynaml/examples/TestGPHousing.scala | 0 .../dynaml/examples/TestHousing.scala | 0 .../dynaml/examples/TestMagicGamma.scala | 0 .../dynaml/examples/TestNNDelve.scala | 0 .../dynaml/examples/TestNNHousing.scala | 0 .../dynaml/examples/TestNNWineQuality.scala | 0 .../mandar2812/dynaml/examples/TestPole.scala | 1 + .../dynaml/examples/TestRipley.scala | 0 .../mandar2812/dynaml/examples/TestSUSY.scala | 0 .../mandar2812/dynaml/pipes/DataPipe.scala | 0 .../dynaml/pipes/StreamDataPipe.scala | 0 maven-central-deploy.sh | 14 ---- .../github/mandar2812/dynaml/repl/DLoop.scala | 75 ------------------- .../dynaml/repl/DynaMLClassLoader.scala | 14 ---- 125 files changed, 65 insertions(+), 149 deletions(-) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/DynaMLPipe.scala (92%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetrics.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetricsSpark.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/evaluation/Metrics.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/evaluation/RegressionMetrics.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/evaluation/RegressionMetricsSpark.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/graph/CausalEdge.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/graph/Label.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/graph/Neuron.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/graph/ParamEdge.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/graph/Parameter.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/graph/Point.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/graph/Synapse.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/AnovaKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/CauchyKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/DensityKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/DiracKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/ExponentialKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/FBMKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/GaussianDensityKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/IdentityCovFunc.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/Kernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/LaplacianKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/LinearKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/PeriodicKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/PolynomialKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/RBFKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/RationalQuadraticKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/SVMKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/TStudentKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/WaveKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/kernels/WaveletKernel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/DLSSVMPipe.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/GLMPipe.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/GPRegressionPipe.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/Model.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/ModelPipe.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/ensemble/CommitteeModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/ensemble/MetaModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/gp/AbstractGPClassification.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/gp/AbstractGPRegressionModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/gp/GPCommitteeRegression.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/gp/GPNarModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/gp/GPNarXModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/gp/GPRegression.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/gp/GPTimeSeries.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/gp/GaussianProcessModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/gp/LaplaceBinaryGPC.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/lm/GeneralizedLinearModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/lm/LogisticGLM.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/lm/RegularizedGLM.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/neuralnets/AutoEncoder.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/neuralnets/CommitteeNetwork.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/neuralnets/FFNeuralGraph.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/neuralnets/FeedForwardNetwork.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/neuralnets/NeuralGraph.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/neuralnets/NeuralNetwork.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/neuralnets/TransferFunctions.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/svm/AbstractDualLSSVM.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/svm/DLSSVM.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/svm/KernelLSSVMModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/svm/KernelSparkModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/svm/LSSVMCommittee.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/svm/LSSVMModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/svm/LSSVMSparkModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/svm/LSSVMTurbo.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/models/svm/SDLSSVMModel.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/AbstractCSA.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/AbstractGridSearch.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/BackPropogation.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/CommitteeModelSolver.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/ConjugateGradientSpark.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/CoupledSimulatedAnnealing.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/GPMLOptimizer.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/GlobalOptimizer.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/GloballyOptimizable.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/Gradient.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/GradientDescent.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/GradientDescentSpark.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/GridSearch.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/LSSVMLinearSolver.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/LaplacePosteriorMode.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/Likelihood.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/Optimizer.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/QuasiNewtonOptimizer.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/RegularizedLSSolver.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/optimization/Updater.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/prototype/EntropyMeasure.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/prototype/EntropySelector.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/prototype/Measure.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/prototype/QuadraticRenyiEntropy.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/prototype/SubsetSelector.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/utils/MinMaxAccumulator.scala (100%) rename {src/main/scala => dynaml-core/src/main/scala-2.11}/io/github/mandar2812/dynaml/utils/package.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/AbottPowerPlant.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala (98%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/FSExperiment.scala (99%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala (98%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/PreprocessAdult.scala (99%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/PreprocessForestCover.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/PreprocessSusy.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala (99%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestAdult.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala (99%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestDelve.scala (98%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestForestCover.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestGPDelve.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestGPHousing.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestHousing.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestMagicGamma.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestNNDelve.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestNNHousing.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestNNWineQuality.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestPole.scala (98%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestRipley.scala (100%) rename {src/main/scala => dynaml-examples/src/main/scala-2.11}/io/github/mandar2812/dynaml/examples/TestSUSY.scala (100%) rename {src/main/scala => dynaml-pipes/src/main/scala-2.11}/io/github/mandar2812/dynaml/pipes/DataPipe.scala (100%) rename {src/main/scala => dynaml-pipes/src/main/scala-2.11}/io/github/mandar2812/dynaml/pipes/StreamDataPipe.scala (100%) delete mode 100755 maven-central-deploy.sh delete mode 100644 src/main/scala/io/github/mandar2812/dynaml/repl/DLoop.scala delete mode 100644 src/main/scala/io/github/mandar2812/dynaml/repl/DynaMLClassLoader.scala diff --git a/.gitignore b/.gitignore index de8aac9f9..bd8a59a49 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,9 @@ build/*.jar .settings .cache target/* +dynaml-core/target/* +dynaml-examples/target/* +dynaml-pipes/target/* .DS_Store release.properties *.log diff --git a/build.sbt b/build.sbt index 80a74942f..055cff460 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,8 @@ import sbt._ import java.io.File +import sbtbuildinfo.BuildInfoPlugin.autoImport._ + maintainer := "Mandar Chandorkar " packageSummary := "Scala Library/REPL for Machine Learning Research" @@ -12,14 +14,13 @@ packageDescription := "DynaML is a scala library/repl for implementing and worki 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 +43,41 @@ 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 := "v1.4-beta.7" + ) + +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 := "v1.4-beta.7", + fork in run := true, buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion), buildInfoPackage := "io.github.mandar2812.dynaml.repl", buildInfoUsePackageAsPath := true, @@ -67,6 +94,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");""" + +) diff --git a/src/main/scala/io/github/mandar2812/dynaml/DynaMLPipe.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/DynaMLPipe.scala similarity index 92% rename from src/main/scala/io/github/mandar2812/dynaml/DynaMLPipe.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/DynaMLPipe.scala index e24887285..626bea8e1 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/DynaMLPipe.scala +++ b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/DynaMLPipe.scala @@ -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 +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.pipes.{DataPipe, ParallelPipe, StreamDataPipe} +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) diff --git a/src/main/scala/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetrics.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetrics.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetrics.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetrics.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetricsSpark.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetricsSpark.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetricsSpark.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/BinaryClassificationMetricsSpark.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/evaluation/Metrics.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/Metrics.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/evaluation/Metrics.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/Metrics.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/evaluation/RegressionMetrics.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/RegressionMetrics.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/evaluation/RegressionMetrics.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/RegressionMetrics.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/evaluation/RegressionMetricsSpark.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/RegressionMetricsSpark.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/evaluation/RegressionMetricsSpark.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/evaluation/RegressionMetricsSpark.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/graph/CausalEdge.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/CausalEdge.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/graph/CausalEdge.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/CausalEdge.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/graph/Label.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Label.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/graph/Label.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Label.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/graph/Neuron.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Neuron.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/graph/Neuron.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Neuron.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/graph/ParamEdge.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/ParamEdge.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/graph/ParamEdge.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/ParamEdge.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/graph/Parameter.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Parameter.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/graph/Parameter.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Parameter.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/graph/Point.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Point.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/graph/Point.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Point.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/graph/Synapse.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Synapse.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/graph/Synapse.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/graph/Synapse.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/AnovaKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/AnovaKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/AnovaKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/AnovaKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/CauchyKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/CauchyKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/CauchyKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/CauchyKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/DensityKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/DensityKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/DensityKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/DensityKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/DiracKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/DiracKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/DiracKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/DiracKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/ExponentialKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/ExponentialKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/ExponentialKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/ExponentialKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/FBMKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/FBMKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/FBMKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/FBMKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/GaussianDensityKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/GaussianDensityKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/GaussianDensityKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/GaussianDensityKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/IdentityCovFunc.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/IdentityCovFunc.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/IdentityCovFunc.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/IdentityCovFunc.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/Kernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/Kernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/Kernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/Kernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/LaplacianKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/LaplacianKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/LaplacianKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/LaplacianKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/LinearKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/LinearKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/LinearKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/LinearKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/PeriodicKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/PeriodicKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/PeriodicKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/PeriodicKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/PolynomialKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/PolynomialKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/PolynomialKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/PolynomialKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/RBFKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/RBFKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/RBFKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/RBFKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/RationalQuadraticKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/RationalQuadraticKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/RationalQuadraticKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/RationalQuadraticKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/SVMKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/SVMKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/SVMKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/SVMKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/TStudentKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/TStudentKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/TStudentKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/TStudentKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/WaveKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/WaveKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/WaveKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/WaveKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/kernels/WaveletKernel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/WaveletKernel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/kernels/WaveletKernel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/kernels/WaveletKernel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/DLSSVMPipe.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/DLSSVMPipe.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/DLSSVMPipe.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/DLSSVMPipe.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/GLMPipe.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/GLMPipe.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/GLMPipe.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/GLMPipe.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/GPRegressionPipe.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/GPRegressionPipe.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/GPRegressionPipe.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/GPRegressionPipe.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/Model.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/Model.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/Model.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/Model.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/ModelPipe.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/ModelPipe.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/ModelPipe.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/ModelPipe.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/CommitteeModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/ensemble/CommitteeModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/ensemble/CommitteeModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/ensemble/CommitteeModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/ensemble/MetaModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/ensemble/MetaModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/ensemble/MetaModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/ensemble/MetaModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/AbstractGPClassification.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/AbstractGPClassification.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/gp/AbstractGPClassification.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/AbstractGPClassification.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/AbstractGPRegressionModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/AbstractGPRegressionModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/gp/AbstractGPRegressionModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/AbstractGPRegressionModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/GPCommitteeRegression.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPCommitteeRegression.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/gp/GPCommitteeRegression.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPCommitteeRegression.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/GPNarModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPNarModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/gp/GPNarModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPNarModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/GPNarXModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPNarXModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/gp/GPNarXModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPNarXModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/GPRegression.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPRegression.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/gp/GPRegression.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPRegression.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/GPTimeSeries.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPTimeSeries.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/gp/GPTimeSeries.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GPTimeSeries.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/GaussianProcessModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GaussianProcessModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/gp/GaussianProcessModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/GaussianProcessModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/gp/LaplaceBinaryGPC.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/LaplaceBinaryGPC.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/gp/LaplaceBinaryGPC.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/gp/LaplaceBinaryGPC.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/lm/GeneralizedLinearModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/lm/GeneralizedLinearModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/lm/GeneralizedLinearModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/lm/GeneralizedLinearModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/lm/LogisticGLM.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/lm/LogisticGLM.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/lm/LogisticGLM.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/lm/LogisticGLM.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/lm/RegularizedGLM.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/lm/RegularizedGLM.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/lm/RegularizedGLM.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/lm/RegularizedGLM.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/AutoEncoder.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/AutoEncoder.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/AutoEncoder.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/AutoEncoder.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/CommitteeNetwork.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/CommitteeNetwork.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/CommitteeNetwork.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/CommitteeNetwork.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/FFNeuralGraph.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/FFNeuralGraph.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/FFNeuralGraph.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/FFNeuralGraph.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/FeedForwardNetwork.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/FeedForwardNetwork.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/FeedForwardNetwork.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/FeedForwardNetwork.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/NeuralGraph.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/NeuralGraph.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/NeuralGraph.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/NeuralGraph.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/NeuralNetwork.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/NeuralNetwork.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/NeuralNetwork.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/NeuralNetwork.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/TransferFunctions.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/TransferFunctions.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/neuralnets/TransferFunctions.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/neuralnets/TransferFunctions.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/AbstractDualLSSVM.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/AbstractDualLSSVM.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/svm/AbstractDualLSSVM.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/AbstractDualLSSVM.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/DLSSVM.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/DLSSVM.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/svm/DLSSVM.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/DLSSVM.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/KernelLSSVMModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/KernelLSSVMModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/svm/KernelLSSVMModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/KernelLSSVMModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/KernelSparkModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/KernelSparkModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/svm/KernelSparkModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/KernelSparkModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMCommittee.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/LSSVMCommittee.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMCommittee.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/LSSVMCommittee.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/LSSVMModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/LSSVMModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMSparkModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/LSSVMSparkModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMSparkModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/LSSVMSparkModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMTurbo.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/LSSVMTurbo.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/svm/LSSVMTurbo.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/LSSVMTurbo.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/models/svm/SDLSSVMModel.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/SDLSSVMModel.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/models/svm/SDLSSVMModel.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/models/svm/SDLSSVMModel.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/AbstractCSA.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/AbstractCSA.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/AbstractCSA.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/AbstractCSA.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/AbstractGridSearch.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/AbstractGridSearch.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/AbstractGridSearch.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/AbstractGridSearch.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/BackPropogation.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/BackPropogation.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/BackPropogation.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/BackPropogation.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/CommitteeModelSolver.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/CommitteeModelSolver.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/CommitteeModelSolver.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/CommitteeModelSolver.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradientSpark.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/ConjugateGradientSpark.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradientSpark.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/ConjugateGradientSpark.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/CoupledSimulatedAnnealing.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/CoupledSimulatedAnnealing.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/CoupledSimulatedAnnealing.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/CoupledSimulatedAnnealing.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/GPMLOptimizer.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GPMLOptimizer.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/GPMLOptimizer.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GPMLOptimizer.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/GlobalOptimizer.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GlobalOptimizer.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/GlobalOptimizer.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GlobalOptimizer.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/GloballyOptimizable.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GloballyOptimizable.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/GloballyOptimizable.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GloballyOptimizable.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/Gradient.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/Gradient.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/Gradient.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/Gradient.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescent.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GradientDescent.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescent.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GradientDescent.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescentSpark.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GradientDescentSpark.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescentSpark.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GradientDescentSpark.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/GridSearch.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GridSearch.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/GridSearch.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/GridSearch.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/LSSVMLinearSolver.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/LSSVMLinearSolver.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/LSSVMLinearSolver.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/LSSVMLinearSolver.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/LaplacePosteriorMode.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/LaplacePosteriorMode.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/LaplacePosteriorMode.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/LaplacePosteriorMode.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/Likelihood.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/Likelihood.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/Likelihood.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/Likelihood.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/Optimizer.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/Optimizer.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/Optimizer.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/Optimizer.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/QuasiNewtonOptimizer.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/QuasiNewtonOptimizer.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/QuasiNewtonOptimizer.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/QuasiNewtonOptimizer.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/RegularizedLSSolver.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/RegularizedLSSolver.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/RegularizedLSSolver.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/RegularizedLSSolver.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/Updater.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/Updater.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/optimization/Updater.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/Updater.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/prototype/EntropyMeasure.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/EntropyMeasure.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/prototype/EntropyMeasure.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/EntropyMeasure.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/prototype/EntropySelector.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/EntropySelector.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/prototype/EntropySelector.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/EntropySelector.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/prototype/Measure.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/Measure.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/prototype/Measure.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/Measure.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/prototype/QuadraticRenyiEntropy.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/QuadraticRenyiEntropy.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/prototype/QuadraticRenyiEntropy.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/QuadraticRenyiEntropy.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/prototype/SubsetSelector.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/SubsetSelector.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/prototype/SubsetSelector.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/prototype/SubsetSelector.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/utils/MinMaxAccumulator.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/utils/MinMaxAccumulator.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/utils/MinMaxAccumulator.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/utils/MinMaxAccumulator.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/utils/package.scala b/dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/utils/package.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/utils/package.scala rename to dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/utils/package.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlant.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/AbottPowerPlant.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlant.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/AbottPowerPlant.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala index a29d17529..b0f88623f 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala +++ b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/AbottPowerPlantNN.scala @@ -20,11 +20,11 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.DenseVector import com.quantifind.charts.Highcharts._ +import io.github.mandar2812.dynaml.pipes.{DataPipe, StreamDataPipe} +import org.apache.log4j.Logger import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.models.neuralnets.{FFNeuralGraph, FeedForwardNetwork} -import io.github.mandar2812.dynaml.pipes.{DataPipe, StreamDataPipe} -import org.apache.log4j.Logger import scala.collection.mutable.{MutableList => ML} /** diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala similarity index 98% rename from src/main/scala/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala index 8d4c8a9ba..21af7a4ea 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala +++ b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/DaisyPowerPlant.scala @@ -22,7 +22,7 @@ import breeze.linalg.{DenseMatrix, DenseVector} import com.quantifind.charts.Highcharts._ import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics -import io.github.mandar2812.dynaml.kernels.{CovarianceFunction, LocalSVMKernel} +import io.github.mandar2812.dynaml.kernels.CovarianceFunction import io.github.mandar2812.dynaml.models.svm.DLSSVM import io.github.mandar2812.dynaml.optimization.{GPMLOptimizer, GridSearch} import io.github.mandar2812.dynaml.pipes.{DataPipe, StreamDataPipe} diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/FSExperiment.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/FSExperiment.scala similarity index 99% rename from src/main/scala/io/github/mandar2812/dynaml/examples/FSExperiment.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/FSExperiment.scala index e2f6d124c..7e0c737c9 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/FSExperiment.scala +++ b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/FSExperiment.scala @@ -23,6 +23,7 @@ import java.io.File import breeze.linalg.DenseVector import com.github.tototoshi.csv.CSVWriter import io.github.mandar2812.dynaml.utils + import scala.collection.mutable.{MutableList => ML} /** diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala similarity index 98% rename from src/main/scala/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala index 92938f54c..87f75a21d 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala +++ b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/LightCurveAGN.scala @@ -20,13 +20,15 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.{DenseMatrix, DenseVector} import com.quantifind.charts.Highcharts._ +import io.github.mandar2812.dynaml.pipes.DataPipe +import org.apache.log4j.Logger import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.kernels.CovarianceFunction -import io.github.mandar2812.dynaml.models.gp.{GPNarModel, GPRegression, GPTimeSeries} +import io.github.mandar2812.dynaml.models.gp.{GPNarModel, GPTimeSeries} import io.github.mandar2812.dynaml.optimization.{GPMLOptimizer, GridSearch} import io.github.mandar2812.dynaml.pipes.DataPipe -import org.apache.log4j.Logger + /** * Created by mandar on 4/3/16. diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/PreprocessAdult.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/PreprocessAdult.scala similarity index 99% rename from src/main/scala/io/github/mandar2812/dynaml/examples/PreprocessAdult.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/PreprocessAdult.scala index a3d2c7949..39a7e9eaa 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/PreprocessAdult.scala +++ b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/PreprocessAdult.scala @@ -19,7 +19,9 @@ under the License. package io.github.mandar2812.dynaml.examples import java.io.BufferedReader + import com.github.tototoshi.csv.CSVWriter + import scala.util.Random class ExtendedString(s:String) { diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/PreprocessForestCover.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/PreprocessForestCover.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/PreprocessForestCover.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/PreprocessForestCover.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/PreprocessSusy.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/PreprocessSusy.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/PreprocessSusy.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/PreprocessSusy.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala similarity index 99% rename from src/main/scala/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala index 80a046ee2..38b31f0eb 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala +++ b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/SantaFeLaser.scala @@ -20,13 +20,15 @@ package io.github.mandar2812.dynaml.examples import breeze.linalg.{DenseMatrix, DenseVector} import com.quantifind.charts.Highcharts._ +import io.github.mandar2812.dynaml.pipes.DataPipe +import org.apache.log4j.Logger import io.github.mandar2812.dynaml.DynaMLPipe import io.github.mandar2812.dynaml.evaluation.RegressionMetrics import io.github.mandar2812.dynaml.kernels.CovarianceFunction import io.github.mandar2812.dynaml.models.gp.GPNarModel import io.github.mandar2812.dynaml.optimization.{GPMLOptimizer, GridSearch} import io.github.mandar2812.dynaml.pipes.DataPipe -import org.apache.log4j.Logger + /** * Created by mandar on 4/3/16. diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestAdult.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestAdult.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestAdult.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestAdult.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala similarity index 99% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala index 80783f946..edecb9b47 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala +++ b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestCommitteeNNOmni.scala @@ -18,8 +18,6 @@ under the License. * */ package io.github.mandar2812.dynaml.examples - - import breeze.linalg.DenseVector import com.quantifind.charts.Highcharts._ import io.github.mandar2812.dynaml.DynaMLPipe diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestDelve.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestDelve.scala similarity index 98% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestDelve.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestDelve.scala index 2e35826a1..81e8f47a1 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestDelve.scala +++ b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestDelve.scala @@ -25,9 +25,9 @@ import com.github.tototoshi.csv.CSVWriter import io.github.mandar2812.dynaml.kernels.{RBFKernel, SVMKernel} import io.github.mandar2812.dynaml.models.KernelizedModel import io.github.mandar2812.dynaml.models.svm.{KernelSparkModel, LSSVMSparkModel} -import org.apache.spark.{SparkContext, SparkConf} import org.apache.spark.mllib.regression.LabeledPoint import org.apache.spark.rdd.RDD +import org.apache.spark.{SparkConf, SparkContext} /** * @author mandar2812 on 22/6/15. diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestForestCover.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestForestCover.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestForestCover.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestForestCover.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestGPDelve.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestGPDelve.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestGPDelve.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestGPDelve.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestGPHousing.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestGPHousing.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestGPHousing.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestGPHousing.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestHousing.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestHousing.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestHousing.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestHousing.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestMagicGamma.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestMagicGamma.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestMagicGamma.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestMagicGamma.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNDelve.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestNNDelve.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestNNDelve.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestNNDelve.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNHousing.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestNNHousing.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestNNHousing.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestNNHousing.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestNNWineQuality.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestNNWineQuality.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestNNWineQuality.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestNNWineQuality.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestPole.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestPole.scala similarity index 98% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestPole.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestPole.scala index 47c5f4c55..fa7bece5c 100644 --- a/src/main/scala/io/github/mandar2812/dynaml/examples/TestPole.scala +++ b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestPole.scala @@ -10,6 +10,7 @@ import io.github.mandar2812.dynaml.models.svm.{KernelSparkModel, LSSVMSparkModel import org.apache.spark.{SparkContext, SparkConf} import org.apache.spark.mllib.regression.LabeledPoint import org.apache.spark.rdd.RDD +import org.apache.spark.{SparkConf, SparkContext} /** * @author mandar2812 on 22/6/15. diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestRipley.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestRipley.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestRipley.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestRipley.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/examples/TestSUSY.scala b/dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestSUSY.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/examples/TestSUSY.scala rename to dynaml-examples/src/main/scala-2.11/io/github/mandar2812/dynaml/examples/TestSUSY.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/pipes/DataPipe.scala b/dynaml-pipes/src/main/scala-2.11/io/github/mandar2812/dynaml/pipes/DataPipe.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/pipes/DataPipe.scala rename to dynaml-pipes/src/main/scala-2.11/io/github/mandar2812/dynaml/pipes/DataPipe.scala diff --git a/src/main/scala/io/github/mandar2812/dynaml/pipes/StreamDataPipe.scala b/dynaml-pipes/src/main/scala-2.11/io/github/mandar2812/dynaml/pipes/StreamDataPipe.scala similarity index 100% rename from src/main/scala/io/github/mandar2812/dynaml/pipes/StreamDataPipe.scala rename to dynaml-pipes/src/main/scala-2.11/io/github/mandar2812/dynaml/pipes/StreamDataPipe.scala diff --git a/maven-central-deploy.sh b/maven-central-deploy.sh deleted file mode 100755 index d5158c31e..000000000 --- a/maven-central-deploy.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# Deploy maven artefact in current directory into Maven central repository -# using maven-release-plugin goals - -read -p "Really deploy to maven cetral repository (yes/no)? " - -if ( [ "$REPLY" == "yes" ] ) then - ssh-add ~/.ssh/id_rsa - ssh-add -l - mvn release:clean release:prepare release:perform -B -e | tee maven-central-deploy.log - ssh-add -D -else - echo 'Exit without deploy' -fi diff --git a/src/main/scala/io/github/mandar2812/dynaml/repl/DLoop.scala b/src/main/scala/io/github/mandar2812/dynaml/repl/DLoop.scala deleted file mode 100644 index 41c523c46..000000000 --- a/src/main/scala/io/github/mandar2812/dynaml/repl/DLoop.scala +++ /dev/null @@ -1,75 +0,0 @@ -package io.github.mandar2812.dynaml.repl - -import java.io.BufferedReader - -import scala.tools.nsc.interpreter._ -import scala.tools.nsc.{Settings, util} - -//looper class to read user inputs and let interpreter evaluate at loop() function. -class DLoop(in0: Option[BufferedReader], override protected val out: JPrintWriter) extends ILoop { - def this() = this(None, new JPrintWriter(Console.out, true)) - - import LoopCommand.cmd - - //custom commands list - lazy val myCommandSeq = Seq( - cmd("myCommand", "[-v] ", "my command!", myCommand) - ) - - //add to my custom commands to default commands. - override def commands = super.commands ++ myCommandSeq - - override def prompt = "DynaML>" - - //myCommand implementation - private def myCommand(line0: String): Result = { - line0.trim match { - case "" => ":myCommand [-v] " - case s => s"""This is a custom command example. """+ - """You can do something from value "${s}" with custom Scala interpreter.""" - } - } - - //show welcome message when user login - override def printWelcome(): Unit = { - echo(" ___ ___ ___ ___ ___ ___ "+ - " \n /\\ \\ /\\__\\ /\\__\\ /\\ \\ /\\__\\ "+ - " /\\__\\ \n /::\\ \\ |::L__L /:| _|_ /::\\ \\ /::L_L_ "+ - " /:/ / \n /:/\\:\\__\\ |:::\\__\\ /::|/\\__\\ /::\\:\\__\\ "+ - "/:/L:\\__\\ /:/__/ \n \\:\\/:/ / /:;;/__/ \\/|::/ / \\/\\::/ "+ - " / \\/_/:/ / \\:\\ \\ \n \\::/ / \\/__/ |:/ / /:/ "+ - " / /:/ / \\:\\__\\ \n \\/__/ \\/__/ "+ - " \\/__/ \\/__/ \\/__/ ") - val version = BuildInfo.version - echo("\nWelcome to DynaML "+version+ - "\nInteractive Scala shell for Machine Learning Research") - } - - settings = new Settings - settings.embeddedDefaults[this.type] - - //MyInterpreter initialization - override def createInterpreter(): Unit = { - if (addedClasspath != "") - settings.classpath append addedClasspath - - intp = new MyInterpreter() - } - - //Interpreter class. Use DynaMLClassLoader to load any classes - class MyInterpreter extends IMain(settings, out) { - private var myClassLoader: Option[DynaMLClassLoader] = None - - override def resetClassLoader(): Unit = { - myClassLoader = None - } - - override def classLoader: util.AbstractFileClassLoader = { - myClassLoader.getOrElse { - myClassLoader = Some(new DynaMLClassLoader(replOutput.dir, parentClassLoader, out)) - myClassLoader.get - } - } - } - -} diff --git a/src/main/scala/io/github/mandar2812/dynaml/repl/DynaMLClassLoader.scala b/src/main/scala/io/github/mandar2812/dynaml/repl/DynaMLClassLoader.scala deleted file mode 100644 index 0a1662571..000000000 --- a/src/main/scala/io/github/mandar2812/dynaml/repl/DynaMLClassLoader.scala +++ /dev/null @@ -1,14 +0,0 @@ -package io.github.mandar2812.dynaml.repl - -import scala.reflect.internal.util.ScalaClassLoader -import scala.tools.nsc.interpreter.JPrintWriter -import scala.tools.nsc.io.AbstractFile -import scala.tools.nsc.util - -class DynaMLClassLoader(root:AbstractFile, parent:ClassLoader, out:JPrintWriter) extends - util.AbstractFileClassLoader(root,parent) with ScalaClassLoader{ - override def loadClass(name: String): Class[_] = { - //out.println(s"DynaMLClassLoader loads classOf ${name}") - super.loadClass(name) - } -} From 791289fdf3e88d9ae8af05fb9c10b13aeb47f658 Mon Sep 17 00:00:00 2001 From: Mandar Chandorkar Date: Wed, 15 Jun 2016 17:02:18 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 9f9dcce80..318b9d64a 100644 --- a/README.md +++ b/README.md @@ -94,18 +94,22 @@ Steps You should get the following prompt. ``` - ___ ___ ___ ___ ___ ___ - /\ \ /\__\ /\__\ /\ \ /\__\ /\__\ - /::\ \ |::L__L /:| _|_ /::\ \ /::L_L_ /:/ / - /:/\:\__\ |:::\__\ /::|/\__\ /::\:\__\ /:/L:\__\ /:/__/ - \:\/:/ / /:;;/__/ \/|::/ / \/\::/ / \/_/:/ / \:\ \ - \::/ / \/__/ |:/ / /:/ / /:/ / \:\__\ - \/__/ \/__/ \/__/ \/__/ \/__/ - -Welcome to DynaML v 1.3 -Interactive Scala shell - -DynaML> + ___ ___ ___ ___ ___ ___ + /\ \ |\__\ /\__\ /\ \ /\__\ /\__\ + /::\ \ |:| | /::| | /::\ \ /::| | /:/ / + /:/\:\ \ |:| | /:|:| | /:/\:\ \ /:|:| | /:/ / + /:/ \:\__\ |:|__|__ /:/|:| |__ /::\~\:\ \ /:/|:|__|__ /:/ / + /:/__/ \:|__| /::::\__\ /:/ |:| /\__\ /:/\:\ \:\__\ /:/ |::::\__\ /:/__/ + \:\ \ /:/ / /:/~~/~ \/__|:|/:/ / \/__\:\/:/ / \/__/~~/:/ / \:\ \ + \:\ /:/ / /:/ / |:/:/ / \::/ / /:/ / \:\ \ + \:\/:/ / \/__/ |::/ / /:/ / /:/ / \:\ \ + \::/__/ /:/ / /:/ / /:/ / \:\__\ + ~~ \/__/ \/__/ \/__/ \/__/ + +Welcome to DynaML v1.4-beta.8 +Interactive Scala shell for Machine Learning Research +(Scala 2.11.7 Java 1.7.0_80) +DynaML> ``` Getting Started From fd8f1b2f3709b8bb0e9c82e12f970ab1922f28c7 Mon Sep 17 00:00:00 2001 From: mandar2812 Date: Wed, 15 Jun 2016 17:03:22 +0200 Subject: [PATCH 4/4] Mods to build file --- build.sbt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 055cff460..43d9c6e20 100644 --- a/build.sbt +++ b/build.sbt @@ -12,6 +12,8 @@ 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") val baseSettings = Seq( @@ -58,7 +60,7 @@ lazy val core = (project in file("dynaml-core")).settings(baseSettings) .dependsOn(pipes) .settings( name := "dynaml-core", - version := "v1.4-beta.7" + version := mainVersion ) lazy val examples = (project in file("dynaml-examples")) @@ -76,8 +78,9 @@ lazy val DynaML = (project in file(".")).enablePlugins(JavaAppPackaging, BuildIn .settings( //aggregate in update := false, name := "DynaML", - version := "v1.4-beta.7", + 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,