Skip to content

Commit

Permalink
Merge branch 'release-1.0' into feat/remove-vtk
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennis Madsen authored Jan 26, 2024
2 parents 6ef44da + 1e55a3c commit f94ad23
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/main/scala/scalismo/io/MeshIO.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import scalismo.io.statisticalmodel.{NDArray, StatisticalModelIOUtils}
import scalismo.io.stl.STL
import scalismo.mesh.*
import scalismo.mesh.TriangleMesh.*

import java.io.{BufferedReader, File, FileReader, IOException}
import scala.reflect.ClassTag
import scala.util.{Failure, Success, Try}
Expand Down
1 change: 1 addition & 0 deletions src/main/scala/scalismo/io/ply/PLYMeshReader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import scalismo.io.FileReader
import scalismo.mesh.{SurfacePointProperty, TriangleList, TriangleMesh, TriangleMesh3D, VertexColorMesh3D}

import java.io.{BufferedReader, File, RandomAccessFile}

import java.nio.{ByteBuffer, ByteOrder}
import scala.util.{Failure, Success, Try}

Expand Down
1 change: 0 additions & 1 deletion src/main/scala/scalismo/io/stl/STL.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package scalismo.io.stl

import scalismo.geometry.{EuclideanVector3D, Point3D}
import scalismo.mesh.TriangleMesh3D

import java.io.{BufferedReader, File, FileReader}
import java.nio.ByteOrder
import scala.util.Try
Expand Down
1 change: 0 additions & 1 deletion src/main/scala/scalismo/mesh/MeshOperations.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import scalismo.mesh.boundingSpheres.{
VolumeSpatialIndex
}
import scalismo.mesh.decimate.MeshDecimation

import scala.collection.parallel.immutable.ParVector

object MeshOperations {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ object GaussianProcess {
)(implicit vectorizer: Vectorizer[Value]): Field[D, Value] = {

val (_, _, posteriorMean) = regressionDataUnpack(gp, trainingData)

Field(gp.domain, posteriorMean)
}

Expand Down
1 change: 1 addition & 0 deletions src/test/scala/scalismo/ScalismoTestSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import org.scalatest.funspec.AnyFunSpec
import org.scalatest.matchers.should.Matchers

class ScalismoTestSuite extends AnyFunSpec with Matchers {

def measureTime[A](func: => A): (A, Double) = {
val startTime = System.currentTimeMillis()
val result = func
Expand Down
1 change: 0 additions & 1 deletion src/test/scala/scalismo/io/MeshIOTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ class MeshIOTests extends ScalismoTestSuite {
mesh should equal(origMesh)
}
}

testWriteRead(".stl")
testWriteRead(".ply")
}
Expand Down

0 comments on commit f94ad23

Please sign in to comment.