Merge branch 'development'

SashkoTar · Sep 18, 2019 · d7fb426 · d7fb426
2 parents 54c6975 + c3db6f8
commit d7fb426
Show file tree

Hide file tree

Showing 59 changed files with 115 additions and 113 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.sparja.syto</groupId>
-    <artifactId>filter</artifactId>
-    <version>0.1.0</version>
+    <groupId>net.sparja</groupId>
+    <artifactId>syto</artifactId>
+    <version>0.1.1</version>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/...om/sparja/syto/filter/Approximation.scala → ...et/sparja/syto/filter/Approximation.scala b/...om/sparja/syto/filter/Approximation.scala → ...et/sparja/syto/filter/Approximation.scala
@@ -1,9 +1,11 @@
-package com.sparja.syto.filter
+package net.sparja.syto.filter
 
 import breeze.math.Complex
-import com.sparja.syto.math.EllipticIntegral.K
-import com.sparja.syto.math.JacobiEllipticFunction._
-import com.sparja.syto.math.{BesselPolynomial, _}
+import net.sparja.syto.math.EllipticIntegral.K
+import net.sparja.syto.math.JacobiEllipticFunction._
+import net.sparja.syto.math.{BesselPolynomial, _}
+import net.sparja.syto.filter
+import net.sparja.syto.math.BesselPolynomial
 
 import scala.collection.immutable.Seq
 
@@ -58,7 +60,7 @@ private[filter] object Approximation {
       case "phase" =>
         val degree = -log10(a_last) / order
         val poles = reversedPoles.map(_ * pow(10, degree))
-        Roots(zeros, poles, 1.0)
+        filter.Roots(zeros, poles, 1.0)
 
       case "delay" =>
         val poles = roots.map(1 / _)
@@ -110,7 +112,7 @@ private[filter] object Approximation {
     }
     val scale = pow(-1, order) * poles.product / zeros.product
 
-    Roots(zeros, poles, scale.real)
+    filter.Roots(zeros, poles, scale.real)
   }
 
    def chebyshev(order: Int, rp: Double) = {
@@ -166,7 +168,7 @@ private[filter] object Approximation {
 
     val scale = if (order % 2 == 0) preScale / sqrt(1 + ep * ep) else preScale
 
-    Roots(zeros, poles, scale.real)
+    filter.Roots(zeros, poles, scale.real)
   }
 
 }
diff --git a/...a/com/sparja/syto/filter/FilterType.scala → ...a/net/sparja/syto/filter/FilterType.scala b/...a/com/sparja/syto/filter/FilterType.scala → ...a/net/sparja/syto/filter/FilterType.scala
@@ -1,4 +1,4 @@
-package com.sparja.syto.filter
+package net.sparja.syto.filter
 
 import breeze.math.Complex
 import breeze.numerics.{pow, sqrt}

diff --git a/.../scala/com/sparja/syto/filter/Roots.scala → .../scala/net/sparja/syto/filter/Roots.scala b/.../scala/com/sparja/syto/filter/Roots.scala → .../scala/net/sparja/syto/filter/Roots.scala
@@ -1,4 +1,4 @@
-package com.sparja.syto.filter
+package net.sparja.syto.filter
 
 import breeze.math.Complex
 import scala.collection.immutable.Seq

diff --git a/...syto/filter/TransferFunctionBuilder.scala → ...syto/filter/TransferFunctionBuilder.scala b/...syto/filter/TransferFunctionBuilder.scala → ...syto/filter/TransferFunctionBuilder.scala
@@ -1,8 +1,10 @@
-package com.sparja.syto.filter
+package net.sparja.syto.filter
 
 import breeze.math.Complex
-import com.sparja.syto.math.Polynomial
-import com.sparja.syto.math.tan
+import net.sparja.syto.math.Polynomial
+import net.sparja.syto.math.tan
+import net.sparja.syto.math.Polynomial
+
 import scala.collection.immutable.Seq
 
 object TransferFunctionBuilder {

diff --git a/...cala/com/sparja/syto/filter/package.scala → ...cala/net/sparja/syto/filter/package.scala b/...cala/com/sparja/syto/filter/package.scala → ...cala/net/sparja/syto/filter/package.scala
@@ -1,8 +1,8 @@
-package com.sparja.syto
+package net.sparja.syto
 
 import breeze.linalg.{DenseMatrix, DenseVector}
 import breeze.math.Complex
-import com.sparja.syto.math.{companionByPolynomial, cos, max, sin}
+import net.sparja.syto.math.{companionByPolynomial, cos, max, sin}
 import scala.collection.immutable.Seq
 
 package object filter {

diff --git a/...m/sparja/syto/math/BesselPolynomial.scala → ...t/sparja/syto/math/BesselPolynomial.scala b/...m/sparja/syto/math/BesselPolynomial.scala → ...t/sparja/syto/math/BesselPolynomial.scala
@@ -1,4 +1,4 @@
-package com.sparja.syto.math
+package net.sparja.syto.math
 
 //TODO Add to Polynomial hierarchy
 

diff --git a/...la/com/sparja/syto/math/Coefficient.scala → ...la/net/sparja/syto/math/Coefficient.scala b/...la/com/sparja/syto/math/Coefficient.scala → ...la/net/sparja/syto/math/Coefficient.scala
@@ -1,4 +1,4 @@
-package com.sparja.syto.math
+package net.sparja.syto.math
 
 import breeze.math.Complex
 

diff --git a/...m/sparja/syto/math/EllipticIntegral.scala → ...t/sparja/syto/math/EllipticIntegral.scala b/...m/sparja/syto/math/EllipticIntegral.scala → ...t/sparja/syto/math/EllipticIntegral.scala
@@ -1,5 +1,4 @@
-package com.sparja.syto.math
-
+package net.sparja.syto.math
 
 private[syto] object EllipticIntegral {
 

diff --git a/...ja/syto/math/JacobiEllipticFunction.scala → ...ja/syto/math/JacobiEllipticFunction.scala b/...ja/syto/math/JacobiEllipticFunction.scala → ...ja/syto/math/JacobiEllipticFunction.scala
@@ -1,4 +1,4 @@
-package com.sparja.syto.math
+package net.sparja.syto.math
 
 import breeze.math.Complex
 

diff --git a/...ala/com/sparja/syto/math/Polynomial.scala → ...ala/net/sparja/syto/math/Polynomial.scala b/...ala/com/sparja/syto/math/Polynomial.scala → ...ala/net/sparja/syto/math/Polynomial.scala
@@ -1,4 +1,4 @@
-package com.sparja.syto.math
+package net.sparja.syto.math
 
 import breeze.math.Complex
 import scala.collection.immutable.Seq

diff --git a/.../scala/com/sparja/syto/math/package.scala → .../scala/net/sparja/syto/math/package.scala b/.../scala/com/sparja/syto/math/package.scala → .../scala/net/sparja/syto/math/package.scala
@@ -1,4 +1,4 @@
-package com.sparja.syto
+package net.sparja.syto
 
 import breeze.linalg.{DenseMatrix, DenseVector, diag}
 import breeze.math.Complex

diff --git a/...yto/filter/FilterImplementationTest.scala → ...yto/filter/FilterImplementationTest.scala b/...yto/filter/FilterImplementationTest.scala → ...yto/filter/FilterImplementationTest.scala
@@ -1,5 +1,4 @@
-package com.sparja.syto.filter
-
+package net.sparja.syto.filter
 
 import junit.framework.TestCase.assertEquals
 import org.junit.Test

diff --git a/...parja/syto/filter/FilterSupportTest.scala → ...parja/syto/filter/FilterSupportTest.scala b/...parja/syto/filter/FilterSupportTest.scala → ...parja/syto/filter/FilterSupportTest.scala
@@ -1,4 +1,4 @@
-package com.sparja.syto.filter
+package net.sparja.syto.filter
 
 import junit.framework.TestCase.assertEquals
 import org.junit.Test

diff --git a/...o/filter/FiltfiltImplementationTest.scala → ...o/filter/FiltfiltImplementationTest.scala b/...o/filter/FiltfiltImplementationTest.scala → ...o/filter/FiltfiltImplementationTest.scala
@@ -1,4 +1,4 @@
-package com.sparja.syto.filter
+package net.sparja.syto.filter
 
 import junit.framework.TestCase.assertEquals
 import org.junit.Test

diff --git a/...com/sparja/syto/filter/FiltfiltTest.scala → ...net/sparja/syto/filter/FiltfiltTest.scala b/...com/sparja/syto/filter/FiltfiltTest.scala → ...net/sparja/syto/filter/FiltfiltTest.scala
@@ -1,5 +1,4 @@
-package com.sparja.syto.filter
-
+package net.sparja.syto.filter
 
 import junit.framework.TestCase.assertEquals
 import org.junit.Test

diff --git a/...er/bessel/analog/BandPassFilterTest.scala → ...er/bessel/analog/BandPassFilterTest.scala b/...er/bessel/analog/BandPassFilterTest.scala → ...er/bessel/analog/BandPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.bessel.analog
+package net.sparja.syto.filter.bessel.analog
 
-import com.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...er/bessel/analog/BandStopFilterTest.scala → ...er/bessel/analog/BandStopFilterTest.scala b/...er/bessel/analog/BandStopFilterTest.scala → ...er/bessel/analog/BandStopFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.bessel.analog
+package net.sparja.syto.filter.bessel.analog
 
-import com.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...er/bessel/analog/HighPassFilterTest.scala → ...er/bessel/analog/HighPassFilterTest.scala b/...er/bessel/analog/HighPassFilterTest.scala → ...er/bessel/analog/HighPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.bessel.analog
+package net.sparja.syto.filter.bessel.analog
 
-import com.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...ter/bessel/analog/LowPassFilterTest.scala → ...ter/bessel/analog/LowPassFilterTest.scala b/...ter/bessel/analog/LowPassFilterTest.scala → ...ter/bessel/analog/LowPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.bessel.analog
+package net.sparja.syto.filter.bessel.analog
 
-import com.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...r/bessel/digital/BandPassFilterTest.scala → ...r/bessel/digital/BandPassFilterTest.scala b/...r/bessel/digital/BandPassFilterTest.scala → ...r/bessel/digital/BandPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.bessel.digital
+package net.sparja.syto.filter.bessel.digital
 
-import com.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...er/bessel/digital/LowPassFilterTest.scala → ...er/bessel/digital/LowPassFilterTest.scala b/...er/bessel/digital/LowPassFilterTest.scala → ...er/bessel/digital/LowPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.bessel.digital
+package net.sparja.syto.filter.bessel.digital
 
-import com.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, Roots, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...tterworth/analog/BandPassFilterTest.scala → ...tterworth/analog/BandPassFilterTest.scala b/...tterworth/analog/BandPassFilterTest.scala → ...tterworth/analog/BandPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.butterworth.analog
+package net.sparja.syto.filter.butterworth.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...tterworth/analog/BandStopFilterTest.scala → ...tterworth/analog/BandStopFilterTest.scala b/...tterworth/analog/BandStopFilterTest.scala → ...tterworth/analog/BandStopFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.butterworth.analog
+package net.sparja.syto.filter.butterworth.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...tterworth/analog/HighPassFilterTest.scala → ...tterworth/analog/HighPassFilterTest.scala b/...tterworth/analog/HighPassFilterTest.scala → ...tterworth/analog/HighPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.butterworth.analog
+package net.sparja.syto.filter.butterworth.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...utterworth/analog/LowPassFilterTest.scala → ...utterworth/analog/LowPassFilterTest.scala b/...utterworth/analog/LowPassFilterTest.scala → ...utterworth/analog/LowPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.butterworth.analog
+package net.sparja.syto.filter.butterworth.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...terworth/digital/BandPassFilterTest.scala → ...terworth/digital/BandPassFilterTest.scala b/...terworth/digital/BandPassFilterTest.scala → ...terworth/digital/BandPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.butterworth.digital
+package net.sparja.syto.filter.butterworth.digital
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...terworth/digital/HighPassFilterTest.scala → ...terworth/digital/HighPassFilterTest.scala b/...terworth/digital/HighPassFilterTest.scala → ...terworth/digital/HighPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.butterworth.digital
+package net.sparja.syto.filter.butterworth.digital
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...tterworth/digital/LowPassFilterTest.scala → ...tterworth/digital/LowPassFilterTest.scala b/...tterworth/digital/LowPassFilterTest.scala → ...tterworth/digital/LowPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.butterworth.digital
+package net.sparja.syto.filter.butterworth.digital
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...chebyshev/analog/BandPassFilterTest.scala → ...chebyshev/analog/BandPassFilterTest.scala b/...chebyshev/analog/BandPassFilterTest.scala → ...chebyshev/analog/BandPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.chebyshev.analog
+package net.sparja.syto.filter.chebyshev.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...chebyshev/analog/BandStopFilterTest.scala → ...chebyshev/analog/BandStopFilterTest.scala b/...chebyshev/analog/BandStopFilterTest.scala → ...chebyshev/analog/BandStopFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.chebyshev.analog
+package net.sparja.syto.filter.chebyshev.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...chebyshev/analog/HighPassFilterTest.scala → ...chebyshev/analog/HighPassFilterTest.scala b/...chebyshev/analog/HighPassFilterTest.scala → ...chebyshev/analog/HighPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.chebyshev.analog
+package net.sparja.syto.filter.chebyshev.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...hebyshev/digital/HighPassFilterTest.scala → ...hebyshev/digital/HighPassFilterTest.scala b/...hebyshev/digital/HighPassFilterTest.scala → ...hebyshev/digital/HighPassFilterTest.scala
@@ -1,7 +1,6 @@
-package com.sparja.syto.filter.chebyshev.digital
+package net.sparja.syto.filter.chebyshev.digital
 
-
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...chebyshev/digital/LowPassFilterTest.scala → ...chebyshev/digital/LowPassFilterTest.scala b/...chebyshev/digital/LowPassFilterTest.scala → ...chebyshev/digital/LowPassFilterTest.scala
@@ -1,7 +1,6 @@
-package com.sparja.syto.filter.chebyshev.digital
+package net.sparja.syto.filter.chebyshev.digital
 
-
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...ebyshevII/analog/BandPassFilterTest.scala → ...ebyshevII/analog/BandPassFilterTest.scala b/...ebyshevII/analog/BandPassFilterTest.scala → ...ebyshevII/analog/BandPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.chebyshevII.analog
+package net.sparja.syto.filter.chebyshevII.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...ebyshevII/analog/BandStopFilterTest.scala → ...ebyshevII/analog/BandStopFilterTest.scala b/...ebyshevII/analog/BandStopFilterTest.scala → ...ebyshevII/analog/BandStopFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.chebyshevII.analog
+package net.sparja.syto.filter.chebyshevII.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...ebyshevII/analog/HighPassFilterTest.scala → ...ebyshevII/analog/HighPassFilterTest.scala b/...ebyshevII/analog/HighPassFilterTest.scala → ...ebyshevII/analog/HighPassFilterTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.chebyshevII.analog
+package net.sparja.syto.filter.chebyshevII.analog
 
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...hebyshevII/analog/LowPassFilterTest.scala → ...hebyshevII/analog/LowPassFilterTest.scala b/...hebyshevII/analog/LowPassFilterTest.scala → ...hebyshevII/analog/LowPassFilterTest.scala
@@ -1,7 +1,6 @@
-package com.sparja.syto.filter.chebyshevII.analog
+package net.sparja.syto.filter.chebyshevII.analog
 
-
-import com.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
+import net.sparja.syto.filter.{Approximation, TransferFunctionBuilder}
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...yto/filter/core/BesselPrototypeTest.scala → ...yto/filter/core/BesselPrototypeTest.scala b/...yto/filter/core/BesselPrototypeTest.scala → ...yto/filter/core/BesselPrototypeTest.scala
@@ -1,10 +1,11 @@
-package com.sparja.syto.filter.core
+package net.sparja.syto.filter.core
 
 import breeze.math.Complex
-import com.sparja.syto.filter.Approximation
-import com.sparja.syto.math.BesselPolynomial
-import com.sparja.syto.util.ComplexAssertion
+import net.sparja.syto.filter.Approximation
+import net.sparja.syto.math.BesselPolynomial
+import net.sparja.syto.util.ComplexAssertion
 import junit.framework.TestCase.assertEquals
+import net.sparja.syto.util.ComplexAssertion
 import org.junit.Test
 
 class BesselPrototypeTest {

diff --git a/...ilter/core/ChebyshevIIPrototypeTest.scala → ...ilter/core/ChebyshevIIPrototypeTest.scala b/...ilter/core/ChebyshevIIPrototypeTest.scala → ...ilter/core/ChebyshevIIPrototypeTest.scala
@@ -1,6 +1,6 @@
-package com.sparja.syto.filter.core
+package net.sparja.syto.filter.core
 
-import com.sparja.syto.filter.Approximation
+import net.sparja.syto.filter.Approximation
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

diff --git a/...o/filter/core/EllipticPrototypeTest.scala → ...o/filter/core/EllipticPrototypeTest.scala b/...o/filter/core/EllipticPrototypeTest.scala → ...o/filter/core/EllipticPrototypeTest.scala
@@ -1,9 +1,10 @@
-package com.sparja.syto.filter.core
+package net.sparja.syto.filter.core
 
 import breeze.math.Complex
-import com.sparja.syto.filter.Approximation
-import com.sparja.syto.util.ComplexAssertion
+import net.sparja.syto.filter.Approximation
+import net.sparja.syto.util.ComplexAssertion
 import junit.framework.TestCase.assertEquals
+import net.sparja.syto.util.ComplexAssertion
 import org.junit.Test
 
 class EllipticPrototypeTest {