Moving around classes/packages [1]

mandar2812 · mandar2812 · commit e67b4ea5c65d · 2016-06-15T12:16:49.000+02:00
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/graph/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/graph/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/graph/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/graph/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/graph/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/graph/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/graph/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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
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
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
diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/BackPropogation.scala b/src/main/scala/io/github/mandar2812/dynaml/optimization/BackPropogation.scala
diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala b/src/main/scala/io/github/mandar2812/dynaml/optimization/ConjugateGradient.scala
diff --git a/src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescent.scala b/src/main/scala/io/github/mandar2812/dynaml/optimization/GradientDescent.scala
diff --git a/src/main/scala/io/github/mandar2812/dynaml/pipes/ModelPipe.scala b/src/main/scala/io/github/mandar2812/dynaml/pipes/ModelPipe.scala
diff --git a/src/main/scala/io/github/mandar2812/dynaml/utils/package.scala b/src/main/scala/io/github/mandar2812/dynaml/utils/package.scala
