Skip to content

Commit 45adb7b

Browse files
committed
Added Matrix T Mixture Pipe
1 parent e939c10 commit 45adb7b

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/modelpipe/MixturePipe.scala

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import breeze.linalg.{DenseMatrix, DenseVector}
44
import breeze.stats.distributions.{ContinuousDistr, Moments}
55
import io.github.mandar2812.dynaml.algebra.{PartitionedPSDMatrix, PartitionedVector}
66
import io.github.mandar2812.dynaml.models.gp.AbstractGPRegressionModel
7-
import io.github.mandar2812.dynaml.models.stp.AbstractSTPRegressionModel
7+
import io.github.mandar2812.dynaml.models.stp.{AbstractSTPRegressionModel, MVStudentsTModel}
88
import io.github.mandar2812.dynaml.models.{ContinuousProcessModel, GenContinuousMixtureModel, SecondOrderProcessModel, StochasticProcessMixtureModel}
99
import io.github.mandar2812.dynaml.optimization.GloballyOptimizable
1010
import io.github.mandar2812.dynaml.pipes.DataPipe2
11-
import io.github.mandar2812.dynaml.probability.{ContinuousRVWithDistr, MultGaussianPRV, MultStudentsTPRV}
12-
import io.github.mandar2812.dynaml.probability.distributions.{BlockedMultiVariateGaussian, BlockedMultivariateStudentsT, HasErrorBars}
11+
import io.github.mandar2812.dynaml.probability.{ContinuousRVWithDistr, MatrixTRV, MultGaussianPRV, MultStudentsTPRV}
12+
import io.github.mandar2812.dynaml.probability.distributions.{BlockedMultiVariateGaussian, BlockedMultivariateStudentsT, HasErrorBars, MatrixT}
1313

1414
import scala.reflect.ClassTag
1515

@@ -54,3 +54,16 @@ class StudentTMixturePipe[T, I: ClassTag] extends
5454
weights: DenseVector[Double]) =
5555
StochasticProcessMixtureModel(models, weights)
5656
}
57+
58+
class MVStudentsTMixturePipe[T, I: ClassTag] extends
59+
MixturePipe[
60+
T, I, DenseVector[Double], DenseMatrix[Double],
61+
(DenseMatrix[Double], DenseMatrix[Double]),
62+
MatrixT, MatrixTRV,
63+
MVStudentsTModel[T, I]] {
64+
65+
override def run(
66+
models: Seq[MVStudentsTModel[T, I]],
67+
weights: DenseVector[Double]) =
68+
StochasticProcessMixtureModel(models, weights)
69+
}

dynaml-core/src/main/scala-2.11/io/github/mandar2812/dynaml/optimization/ProbGPMixtureMachine.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package io.github.mandar2812.dynaml.optimization
22

3-
import breeze.linalg.DenseVector
43
import io.github.mandar2812.dynaml.algebra.{PartitionedPSDMatrix, PartitionedVector}
54
import io.github.mandar2812.dynaml.modelpipe._
6-
import io.github.mandar2812.dynaml.models.StochasticProcessMixtureModel
75
import io.github.mandar2812.dynaml.models.gp.AbstractGPRegressionModel
8-
import io.github.mandar2812.dynaml.pipes.{DataPipe, DataPipe2}
6+
import io.github.mandar2812.dynaml.pipes.DataPipe
97
import io.github.mandar2812.dynaml.probability.MultGaussianPRV
108
import io.github.mandar2812.dynaml.probability.distributions.BlockedMultiVariateGaussian
119

0 commit comments

Comments
 (0)