diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a9ee6e..3ecd9ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## 0.1.3 + +- Add KNN routines ([KNN](https://github.com/astrolabsoftware/spark3D/pull/59), [KNN](https://github.com/astrolabsoftware/spark3D/pull/60), [KNN](https://github.com/astrolabsoftware/spark3D/pull/62)) +- Unify API to load data ([Point3DRDD](https://github.com/astrolabsoftware/spark3D/pull/63), [SphereRDD](https://github.com/astrolabsoftware/spark3D/pull/64)) +- Speed-up cross-match methods by using native Scala methods ([Scala](https://github.com/astrolabsoftware/spark3D/pull/58)) +- Add a new website + spark3D belongs to AstroLab Software ([website](https://astrolabsoftware.github.io/)) +- Update tutorials ([tuto](https://astrolabsoftware.github.io/spark3D/). +- Few fixes here and there... + ## 0.1.1 - Add scripts to generate test data ([PR](https://github.com/astrolabsoftware/spark3D/pull/34)) diff --git a/README.md b/README.md index 730c31b..a3fa3bc 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ - [05/2018] **GSoC 2018**: spark3D has been selected to the Google Summer of Code (GSoC) 2018. Congratulation to [@mayurdb](https://github.com/mayurdb) who will work on the project this year! - [06/2018] **Release**: version 0.1.0, 0.1.1 - [07/2018] **New location**: spark3D is an official project of [AstroLab Software](https://astrolabsoftware.github.io/)! +- [07/2018] **Release**: version 0.1.3 ## Installation and tutorials @@ -21,3 +22,7 @@ See our amazing [website](https://astrolabsoftware.github.io/spark3D/)! * Mayur Bhosale (mayurdb31 at gmail.com) -- GSoC 2018. Contributing to spark3D: see [CONTRIBUTING](https://github.com/astrolabsoftware/spark3D/blob/master/CONTRIBUTING.md). + +## Support + +

diff --git a/build.sbt b/build.sbt index 5f073ce..2610f9c 100644 --- a/build.sbt +++ b/build.sbt @@ -19,8 +19,7 @@ import xerial.sbt.Sonatype._ lazy val root = (project in file(".")). settings( inThisBuild(List( - version := "0.1.2" - // mainClass in Compile := Some("com.sparkfits.examples.OnionSpace") + version := "0.1.3" )), // Name of the application name := "spark3D", @@ -36,7 +35,7 @@ lazy val root = (project in file(".")). // Do not publish artifact in test publishArtifact in Test := false, // Exclude runner class for the coverage - coverageExcludedPackages := ";com.spark3d.examples*", + coverageExcludedPackages := ";com.astrolabsoftware.spark3d.examples*", // Excluding Scala library JARs that are included in the binary Scala distribution // assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false), // Shading to avoid conflicts with pre-installed nom.tam.fits library @@ -47,7 +46,7 @@ lazy val root = (project in file(".")). "org.apache.spark" %% "spark-core" % "2.1.0" % "provided", "org.apache.spark" %% "spark-sql" % "2.1.0" % "provided", // For loading FITS files - "com.github.JulienPeloton" %% "spark-fits" % "0.4.0", + "com.github.astrolabsoftware" %% "spark-fits" % "0.4.0", // "org.datasyslab" % "geospark" % "1.1.3", // Uncomment if you want to trigger visualisation // "com.github.haifengl" % "smile-plot" % "1.5.1", diff --git a/docs/01_installation.md b/docs/01_installation.md index 11c3227..bcb91cc 100644 --- a/docs/01_installation.md +++ b/docs/01_installation.md @@ -77,7 +77,7 @@ toto:~$ spark-shell --jars $JARS --packages $PACKAGES You will be able to import anything from spark3D ```scala -scala> import com.spark3d.geometryObjects.Point3D +scala> import com.astrolabsoftware.spark3d.geometryObjects.Point3D scala> // etc... ``` Note that if you make a fat jar (that is building with `sbt assembly` and not `sbt package`), you do not need to specify external dependencies as they are already included in the resulting jar: diff --git a/docs/02_introduction.md b/docs/02_introduction.md index 7aed9dd..347a9ce 100644 --- a/docs/02_introduction.md +++ b/docs/02_introduction.md @@ -14,7 +14,7 @@ spark3D supports various 3D shapes: points (`Point3D`), spherical shells (`Shell ### Point3D ```scala -import com.spark3d.geometryObjects.Point3D +import com.astrolabsoftware.spark3d.geometryObjects.Point3D // Cartesian coordinates val points = new Point3D(x: Double, y: Double, z: Double, isSpherical: Boolean = false) @@ -26,7 +26,7 @@ val points = new Point3D(r: Double, theta: Double, phi: Double, isSpherical: Boo ### Shells and Spheres ```scala -import com.spark3d.geometryObjects.ShellEnvelope +import com.astrolabsoftware.spark3d.geometryObjects.ShellEnvelope // Shell from 3D coordinates + inner/outer radii val shells = new ShellEnvelope(x: Double, y: Double, z: Double, isSpherical: Boolean, innerRadius: Double, outerRadius: Double) @@ -44,7 +44,7 @@ val spheres = new ShellEnvelope(center: Point3D, isSpherical: Boolean, radius: D ### Boxes ```scala -import com.spark3d.geometryObjects.BoxEnvelope +import com.astrolabsoftware.spark3d.geometryObjects.BoxEnvelope // Box from region defined by three (cartesian) coordinates. val boxes = new BoxEnvelope(p1: Point3D, p2: Point3D, p3: Point3D) @@ -68,7 +68,7 @@ In this tutorial we will review the steps to simply create RDD from 3D data sets A point is an object with 3 spatial coordinates. In spark3D, you can choose the coordinate system between cartesian `(x, y, z)` and spherical `(r, theta, phi)`. Let's suppose we have a text file (CSV, JSON, or TXT) whose columns are labeled `x`, `y` and `z`, the cartesian coordinates of points: ```scala -import com.spark3d.spatial3DRDD.Point3DRDD +import com.astrolabsoftware.spark3d.spatial3DRDD.Point3DRDD // We assume filename contains at least 3 columns whose names are `colnames` // Order of columns in the file does not matter, as they will be re-aranged @@ -79,7 +79,7 @@ val pointRDD = new Point3DRDD(spark: SparkSession, filename: String, colnames: S With FITS data, with data in the HDU #1, you would just do ```scala -import com.spark3d.spatial3DRDD.Point3DRDD +import com.astrolabsoftware.spark3d.spatial3DRDD.Point3DRDD // We assume hdu#1 of filename contains at least 3 columns whose names are `colnames` // Order of columns in the file does not matter, as they will be re-aranged @@ -96,7 +96,7 @@ A sphere is defined by its center (3 spatial coordinates) plus a radius. In spark3D, you can choose the coordinate system of the center between cartesian `(x, y, z)` and spherical `(r, theta, phi)`. Let's suppose we have a text file (CSV, JSON, or TXT) whose columns are labeled `r`, `theta`, `phi`, the spherical coordinates and `radius`: ```scala -import com.spark3d.spatial3DRDD.SphereRDD +import com.astrolabsoftware.spark3d.spatial3DRDD.SphereRDD // We assume filename contains at least 4 columns whose names are `colnames`. // Order of columns in the file does not matter, as they will be re-aranged diff --git a/docs/03_partitioning.md b/docs/03_partitioning.md index 4a1b9c3..02dc12e 100644 --- a/docs/03_partitioning.md +++ b/docs/03_partitioning.md @@ -25,8 +25,8 @@ There are currently 2 partitioning implemented in the library: In the following example, we load `Point3D` data, and we re-partition it with the onion partitioning ```scala -import com.spark3d.spatial3DRDD.Point3DRDD -import com.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatial3DRDD.Point3DRDD +import com.astrolabsoftware.spark3d.utils.GridType import org.apache.spark.sql.SparkSession @@ -56,8 +56,8 @@ val pointRDD_partitioned = pointRDD.spatialPartitioning(GridType.LINEARONIONGRID In the following example, we load `Point3D` data, and we re-partition it with the octree partitioning ```scala -import com.spark3d.spatial3DRDD.Point3DRDD -import com.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatial3DRDD.Point3DRDD +import com.astrolabsoftware.spark3d.utils.GridType import org.apache.spark.sql.SparkSession diff --git a/docs/04_query.md b/docs/04_query.md index 55312bc..59b04e0 100644 --- a/docs/04_query.md +++ b/docs/04_query.md @@ -14,9 +14,9 @@ The spark3D library contains a number of methods and tools to manipulate 3D RDD. A Envelope query takes as input a `RDD[Shape3D]` and an envelope, and returns all objects in the RDD intersecting the envelope (contained in and crossing the envelope): ```scala -import com.spark3d.spatial3DRDD.Point3DRDD -import com.spark3d.geometryObjects.{Point3D, ShellEnvelope} -import com.spark3d.spatialOperator.RangeQuery +import com.astrolabsoftware.spark3d.spatial3DRDD.Point3DRDD +import com.astrolabsoftware.spark3d.geometryObjects.{Point3D, ShellEnvelope} +import com.astrolabsoftware.spark3d.spatialOperator.RangeQuery import org.apache.spark.sql.SparkSession @@ -53,7 +53,7 @@ Envelope = Sphere |Envelope = Box A cross-match takes as input two data sets, and return objects matching based on the center distance, or pixel index of objects. Note that performing a cross-match between a data set of N elements and another of M elements is a priori a NxM operation - so it can be very costly! Let's load two `Point3D` data sets: ```scala -import com.spark3d.spatial3DRDD.Point3DRDD +import com.astrolabsoftware.spark3d.spatial3DRDD.Point3DRDD import org.apache.spark.sql.SparkSession @@ -77,8 +77,8 @@ By default, the two sets are partitioned randomly (in the sense points spatially In order to decrease the cost of performing the cross-match, you need to partition the two data sets the same way. By doing so, you will cross-match only points belonging to the same partition. For a large number of partitions, you will decrease significantly the cost: ```scala -import com.spark3d.utils.GridType -import com.spark3d.spatialPartitioning.SpatialPartitioner +import com.astrolabsoftware.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatialPartitioning.SpatialPartitioner // nPart is the wanted number of partitions. Default is setA_raw partition number. // For the spatial partitioning, you can currently choose between LINEARONIONGRID, or OCTREE. @@ -114,7 +114,7 @@ Currently, we implemented two methods to perform a cross-match: Here is an example which returns only elements from B with counterpart in A using distance center: ```scala -import com.spark3d.spatialOperator.CenterCrossMatch +import com.astrolabsoftware.spark3d.spatialOperator.CenterCrossMatch // Distance threshold for the match val epsilon = 0.004 @@ -127,7 +127,7 @@ val xMatchCenter = CenterCrossMatch and the same using the Healpix indices: ```scala -import com.spark3d.spatialOperator.PixelCrossMatch +import com.astrolabsoftware.spark3d.spatialOperator.PixelCrossMatch // Shell resolution for Healpix indexing val nside = 512 diff --git a/docs/_pages/home.md b/docs/_pages/home.md index 0576b1e..bb1401a 100644 --- a/docs/_pages/home.md +++ b/docs/_pages/home.md @@ -7,7 +7,7 @@ header: cta_label: " Install Now" cta_url: "/docs/installation/" caption: -excerpt: 'Spark extension for processing large-scale 3D data sets: Astrophysics, High Energy Physics, Meteorology, ...
Latest release v0.1.1

{::nomarkdown} {:/nomarkdown}' +excerpt: 'Spark extension for processing large-scale 3D data sets: Astrophysics, High Energy Physics, Meteorology, ...
Latest release v0.1.3

{::nomarkdown} {:/nomarkdown}' feature_row: - image_path: alt: diff --git a/examples/jupyter/CrossMatch.ipynb b/examples/jupyter/CrossMatch.ipynb index 06216fc..ad21ec9 100644 --- a/examples/jupyter/CrossMatch.ipynb +++ b/examples/jupyter/CrossMatch.ipynb @@ -154,7 +154,7 @@ }, "outputs": [], "source": [ - "import com.spark3d.spatial3DRDD._\n", + "import com.astrolabsoftware.spark3d.spatial3DRDD._\n", "import org.apache.spark.sql.SparkSession\n", "val spark = SparkSession.builder().appName(\"Xmatch\").getOrCreate()\n", "\n", @@ -192,8 +192,8 @@ }, "outputs": [], "source": [ - "import com.spark3d.utils.GridType\n", - "import com.spark3d.spatialPartitioning.SpatialPartitioner\n", + "import com.astrolabsoftware.spark3d.utils.GridType\n", + "import com.astrolabsoftware.spark3d.spatialPartitioning.SpatialPartitioner\n", "\n", "// As we are in local mode, and the file is very small, the RDD pointRDD has only 1 partition.\n", "// For the sake of this example, let's increase the number of partition to 100.\n", @@ -244,7 +244,7 @@ } ], "source": [ - "import com.spark3d.spatialOperator.PixelCrossMatch\n", + "import com.astrolabsoftware.spark3d.spatialOperator.PixelCrossMatch\n", "\n", "// Shell resolution\n", "val nside = 512\n", @@ -298,7 +298,7 @@ } ], "source": [ - "import com.spark3d.spatialOperator.CenterCrossMatch\n", + "import com.astrolabsoftware.spark3d.spatialOperator.CenterCrossMatch\n", "\n", "// Distance threshold for the match\n", "val epsilon = 0.004\n", @@ -336,9 +336,9 @@ "import javax.swing.JFrame\n", "import javax.swing.JPanel\n", "\n", - "import com.spark3d.utils.Utils.sphericalToCartesian\n", + "import com.astrolabsoftware.spark3d.utils.Utils.sphericalToCartesian\n", "import org.apache.spark.rdd.RDD\n", - "import com.spark3d.geometryObjects._\n", + "import com.astrolabsoftware.spark3d.geometryObjects._\n", "\n", "\n", "/** Define palette of colors */\n", diff --git a/examples/jupyter/onion_partitioning.ipynb b/examples/jupyter/onion_partitioning.ipynb index 088001e..1f790d9 100644 --- a/examples/jupyter/onion_partitioning.ipynb +++ b/examples/jupyter/onion_partitioning.ipynb @@ -101,7 +101,7 @@ "metadata": {}, "outputs": [], "source": [ - "import com.spark3d.spatial3DRDD._\n", + "import com.astrolabsoftware.spark3d.spatial3DRDD._\n", "import org.apache.spark.sql.SparkSession\n", "val spark = SparkSession.builder().appName(\"OnionSpace\").getOrCreate()\n", "\n", @@ -137,7 +137,7 @@ }, "outputs": [], "source": [ - "import com.spark3d.utils.GridType\n", + "import com.astrolabsoftware.spark3d.utils.GridType\n", "\n", "// As we are in local mode, and the file is very small, the RDD pointRDD has only 1 partition.\n", "// For the sake of this example, let's increase the number of partition to 5.\n", @@ -201,9 +201,9 @@ "import javax.swing.JFrame\n", "import javax.swing.JPanel\n", "\n", - "import com.spark3d.utils.Utils.sphericalToCartesian\n", + "import com.astrolabsoftware.spark3d.utils.Utils.sphericalToCartesian\n", "import org.apache.spark.rdd.RDD\n", - "import com.spark3d.geometryObjects._\n", + "import com.astrolabsoftware.spark3d.geometryObjects._\n", "\n", "/** \n", " * Define palette of colors \n", diff --git a/run_scala.sh b/run_scala.sh index e94c4f0..57c9f77 100755 --- a/run_scala.sh +++ b/run_scala.sh @@ -18,7 +18,7 @@ SBT_VERSION=2.11.8 SBT_VERSION_SPARK=2.11 ## Package version -VERSION=0.1.1 +VERSION=0.1.3 # Package it sbt ++${SBT_VERSION} package @@ -31,7 +31,7 @@ display="show" ## Dependencies jars="lib/jhealpix.jar,lib/swingx-0.9.1.jar" -packages="com.github.astrolabsoftware:spark-fits_2.11:0.3.0,com.github.haifengl:smile-core:1.5.1,com.github.haifengl:smile-plot:1.5.1,com.github.haifengl:smile-math:1.5.1,com.github.haifengl:smile-scala_2.11:1.5.1" +packages="com.github.astrolabsoftware:spark-fits_2.11:0.4.0,com.github.haifengl:smile-core:1.5.1,com.github.haifengl:smile-plot:1.5.1,com.github.haifengl:smile-math:1.5.1,com.github.haifengl:smile-scala_2.11:1.5.1" # Run it! spark-submit \ diff --git a/run_xmatch_cluster.sh b/run_xmatch_cluster.sh index dacbc96..1673fec 100755 --- a/run_xmatch_cluster.sh +++ b/run_xmatch_cluster.sh @@ -18,7 +18,7 @@ SBT_VERSION=2.11.8 SBT_VERSION_SPARK=2.11 ## Package version -VERSION=0.1.1 +VERSION=0.1.3 # Package it sbt ++${SBT_VERSION} package diff --git a/src/main/scala/com/spark3d/examples/CrossMatch.scala b/src/main/scala/com/spark3d/examples/CrossMatch.scala index ac5ca90..3fd462a 100644 --- a/src/main/scala/com/spark3d/examples/CrossMatch.scala +++ b/src/main/scala/com/spark3d/examples/CrossMatch.scala @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.examples +package com.astrolabsoftware.spark3d.examples // spark3d lib -import com.spark3d.utils.GridType -import com.spark3d.spatial3DRDD.Point3DRDD -import com.spark3d.spatialPartitioning.SpatialPartitioner -import com.spark3d.spatialOperator.PixelCrossMatch -import com.spark3d.serialization.Spark3dConf.spark3dConf +import com.astrolabsoftware.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatial3DRDD.Point3DRDD +import com.astrolabsoftware.spark3d.spatialPartitioning.SpatialPartitioner +import com.astrolabsoftware.spark3d.spatialOperator.PixelCrossMatch +import com.astrolabsoftware.spark3d.serialization.Spark3dConf.spark3dConf // Spark lib import org.apache.spark.sql.SparkSession diff --git a/src/main/scala/com/spark3d/examples/OnionSpace.scala b/src/main/scala/com/spark3d/examples/OnionSpace.scala index ed4e22c..03ea1e5 100644 --- a/src/main/scala/com/spark3d/examples/OnionSpace.scala +++ b/src/main/scala/com/spark3d/examples/OnionSpace.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.examples +package com.astrolabsoftware.spark3d.examples // spark3d lib -import com.spark3d.utils.GridType -import com.spark3d.utils.Utils.sphericalToCartesian -import com.spark3d.spatial3DRDD.Point3DRDD +import com.astrolabsoftware.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.utils.Utils.sphericalToCartesian +import com.astrolabsoftware.spark3d.spatial3DRDD.Point3DRDD // Spark lib import org.apache.spark.sql.SparkSession diff --git a/src/main/scala/com/spark3d/geometryObjects/BoxEnvelope.scala b/src/main/scala/com/spark3d/geometryObjects/BoxEnvelope.scala index 1dd4ee9..dbfcdaa 100644 --- a/src/main/scala/com/spark3d/geometryObjects/BoxEnvelope.scala +++ b/src/main/scala/com/spark3d/geometryObjects/BoxEnvelope.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.geometryObjects +package com.astrolabsoftware.spark3d.geometryObjects -import com.spark3d.geometryObjects.Shape3D._ -import com.spark3d.utils.Utils.sphericalToCartesian +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.utils.Utils.sphericalToCartesian import scala.math._ diff --git a/src/main/scala/com/spark3d/geometryObjects/Point3D.scala b/src/main/scala/com/spark3d/geometryObjects/Point3D.scala index fd0f81f..2250bfa 100644 --- a/src/main/scala/com/spark3d/geometryObjects/Point3D.scala +++ b/src/main/scala/com/spark3d/geometryObjects/Point3D.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.geometryObjects +package com.astrolabsoftware.spark3d.geometryObjects -import com.spark3d.geometryObjects.Shape3D._ -import com.spark3d.utils.Utils.sphericalToCartesian +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.utils.Utils.sphericalToCartesian /** * Class for describing a point in 3D space. diff --git a/src/main/scala/com/spark3d/geometryObjects/Shape3D.scala b/src/main/scala/com/spark3d/geometryObjects/Shape3D.scala index 43514c8..78503c1 100644 --- a/src/main/scala/com/spark3d/geometryObjects/Shape3D.scala +++ b/src/main/scala/com/spark3d/geometryObjects/Shape3D.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.geometryObjects +package com.astrolabsoftware.spark3d.geometryObjects -import com.spark3d.utils.Utils._ -import com.spark3d.utils.ExtPointing +import com.astrolabsoftware.spark3d.utils.Utils._ +import com.astrolabsoftware.spark3d.utils.ExtPointing import healpix.essentials.HealpixBase import healpix.essentials.Pointing diff --git a/src/main/scala/com/spark3d/geometryObjects/ShellEnvelope.scala b/src/main/scala/com/spark3d/geometryObjects/ShellEnvelope.scala index ce6865f..5b56bee 100644 --- a/src/main/scala/com/spark3d/geometryObjects/ShellEnvelope.scala +++ b/src/main/scala/com/spark3d/geometryObjects/ShellEnvelope.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.geometryObjects +package com.astrolabsoftware.spark3d.geometryObjects -import com.spark3d.geometryObjects.Shape3D._ -import com.spark3d.utils.Utils.sphericalToCartesian +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.utils.Utils.sphericalToCartesian import scala.math._ diff --git a/src/main/scala/com/spark3d/indexingMethods/HealpixIndexing.scala b/src/main/scala/com/spark3d/indexingMethods/HealpixIndexing.scala index fbdba66..4dee4d2 100644 --- a/src/main/scala/com/spark3d/indexingMethods/HealpixIndexing.scala +++ b/src/main/scala/com/spark3d/indexingMethods/HealpixIndexing.scala @@ -13,6 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d +package com.astrolabsoftware.spark3d object HealpixIndexing diff --git a/src/main/scala/com/spark3d/serialization/Spark3dRegistrator.scala b/src/main/scala/com/spark3d/serialization/Spark3dRegistrator.scala index 77247f4..c539ed9 100644 --- a/src/main/scala/com/spark3d/serialization/Spark3dRegistrator.scala +++ b/src/main/scala/com/spark3d/serialization/Spark3dRegistrator.scala @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.serialization +package com.astrolabsoftware.spark3d.serialization import org.apache.spark.SparkConf -import com.spark3d.geometryObjects.{Point3D, ShellEnvelope, BoxEnvelope} -import com.spark3d.geometryObjects.Shape3D._ -import com.spark3d.spatialPartitioning.{OnionPartitioner, OnionPartitioning, SpatialPartitioner} -import com.spark3d.utils.ExtPointing +import com.astrolabsoftware.spark3d.geometryObjects.{Point3D, ShellEnvelope, BoxEnvelope} +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.spatialPartitioning.{OnionPartitioner, OnionPartitioning, SpatialPartitioner} +import com.astrolabsoftware.spark3d.utils.ExtPointing import java.util.HashSet /** diff --git a/src/main/scala/com/spark3d/spatial3DRDD/Loader.scala b/src/main/scala/com/spark3d/spatial3DRDD/Loader.scala index 1d5ebb8..23023ae 100644 --- a/src/main/scala/com/spark3d/spatial3DRDD/Loader.scala +++ b/src/main/scala/com/spark3d/spatial3DRDD/Loader.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatial3DRDD +package com.astrolabsoftware.spark3d.spatial3DRDD -import com.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.geometryObjects._ import org.apache.spark.sql.SparkSession import org.apache.spark.sql.functions.col diff --git a/src/main/scala/com/spark3d/spatial3DRDD/Point3DRDD.scala b/src/main/scala/com/spark3d/spatial3DRDD/Point3DRDD.scala index 5dc8f6f..dab7db2 100644 --- a/src/main/scala/com/spark3d/spatial3DRDD/Point3DRDD.scala +++ b/src/main/scala/com/spark3d/spatial3DRDD/Point3DRDD.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatial3DRDD +package com.astrolabsoftware.spark3d.spatial3DRDD -import com.spark3d.geometryObjects._ -import com.spark3d.spatial3DRDD.Loader._ +import com.astrolabsoftware.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.spatial3DRDD.Loader._ import org.apache.spark.sql.SparkSession import org.apache.spark.sql.functions.col diff --git a/src/main/scala/com/spark3d/spatial3DRDD/Shape3DRDD.scala b/src/main/scala/com/spark3d/spatial3DRDD/Shape3DRDD.scala index eb20297..df208ba 100644 --- a/src/main/scala/com/spark3d/spatial3DRDD/Shape3DRDD.scala +++ b/src/main/scala/com/spark3d/spatial3DRDD/Shape3DRDD.scala @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatial3DRDD +package com.astrolabsoftware.spark3d.spatial3DRDD // For implicits import scala.collection.mutable.ListBuffer @@ -22,20 +22,20 @@ import scala.math._ import scala.util.Random // Re-partitioning -import com.spark3d.spatialPartitioning.SpatialPartitioner -import com.spark3d.spatialPartitioning.OnionPartitioning -import com.spark3d.spatialPartitioning.OnionPartitioner -import com.spark3d.spatialPartitioning.Octree -import com.spark3d.spatialPartitioning.OctreePartitioning -import com.spark3d.spatialPartitioning.OctreePartitioner +import com.astrolabsoftware.spark3d.spatialPartitioning.SpatialPartitioner +import com.astrolabsoftware.spark3d.spatialPartitioning.OnionPartitioning +import com.astrolabsoftware.spark3d.spatialPartitioning.OnionPartitioner +import com.astrolabsoftware.spark3d.spatialPartitioning.Octree +import com.astrolabsoftware.spark3d.spatialPartitioning.OctreePartitioning +import com.astrolabsoftware.spark3d.spatialPartitioning.OctreePartitioner // 3D Objects -import com.spark3d.geometryObjects._ -import com.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ // Grids -import com.spark3d.utils.GridType -import com.spark3d.utils.GridType._ +import com.astrolabsoftware.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.utils.GridType._ // Spark import org.apache.spark.rdd.RDD diff --git a/src/main/scala/com/spark3d/spatial3DRDD/SphereRDD.scala b/src/main/scala/com/spark3d/spatial3DRDD/SphereRDD.scala index 038100a..93b6346 100644 --- a/src/main/scala/com/spark3d/spatial3DRDD/SphereRDD.scala +++ b/src/main/scala/com/spark3d/spatial3DRDD/SphereRDD.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatial3DRDD +package com.astrolabsoftware.spark3d.spatial3DRDD -import com.spark3d.geometryObjects._ -import com.spark3d.spatial3DRDD.Loader._ +import com.astrolabsoftware.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.spatial3DRDD.Loader._ import org.apache.spark.sql.SparkSession import org.apache.spark.sql.functions.col diff --git a/src/main/scala/com/spark3d/spatialOperator/CenterCrossMatch.scala b/src/main/scala/com/spark3d/spatialOperator/CenterCrossMatch.scala index 4b3fcb5..01a16bc 100644 --- a/src/main/scala/com/spark3d/spatialOperator/CenterCrossMatch.scala +++ b/src/main/scala/com/spark3d/spatialOperator/CenterCrossMatch.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialOperator +package com.astrolabsoftware.spark3d.spatialOperator import scala.reflect.ClassTag -import com.spark3d.geometryObjects.Shape3D._ -import com.spark3d.spatial3DRDD.Shape3DRDD +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.spatial3DRDD.Shape3DRDD import org.apache.spark.rdd.RDD diff --git a/src/main/scala/com/spark3d/spatialOperator/PixelCrossMatch.scala b/src/main/scala/com/spark3d/spatialOperator/PixelCrossMatch.scala index cc5fa00..17e446c 100644 --- a/src/main/scala/com/spark3d/spatialOperator/PixelCrossMatch.scala +++ b/src/main/scala/com/spark3d/spatialOperator/PixelCrossMatch.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialOperator +package com.astrolabsoftware.spark3d.spatialOperator import scala.reflect.ClassTag import scala.collection.mutable.HashSet -import com.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ import org.apache.spark.rdd.RDD diff --git a/src/main/scala/com/spark3d/spatialOperator/RangeQuery.scala b/src/main/scala/com/spark3d/spatialOperator/RangeQuery.scala index c2b2b4c..313c51e 100644 --- a/src/main/scala/com/spark3d/spatialOperator/RangeQuery.scala +++ b/src/main/scala/com/spark3d/spatialOperator/RangeQuery.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialOperator +package com.astrolabsoftware.spark3d.spatialOperator import scala.reflect.ClassTag -import com.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ -import com.spark3d.spatial3DRDD.Shape3DRDD +import com.astrolabsoftware.spark3d.spatial3DRDD.Shape3DRDD import org.apache.spark.rdd.RDD diff --git a/src/main/scala/com/spark3d/spatialOperator/SpatialQuery.scala b/src/main/scala/com/spark3d/spatialOperator/SpatialQuery.scala index 93b5ad0..9cbd8c7 100644 --- a/src/main/scala/com/spark3d/spatialOperator/SpatialQuery.scala +++ b/src/main/scala/com/spark3d/spatialOperator/SpatialQuery.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.spark3d.spatialOperator +package com.astrolabsoftware.spark3d.spatialOperator -import com.spark3d.geometryObjects.Shape3D.Shape3D -import com.spark3d.utils.GeometryObjectComparator +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D.Shape3D +import com.astrolabsoftware.spark3d.utils.GeometryObjectComparator import org.apache.spark.rdd.RDD -import com.spark3d.spatialPartitioning._ +import com.astrolabsoftware.spark3d.spatialPartitioning._ import scala.collection.mutable import scala.collection.mutable.{HashSet, ListBuffer, PriorityQueue} diff --git a/src/main/scala/com/spark3d/spatialPartitioning/Octree.scala b/src/main/scala/com/spark3d/spatialPartitioning/Octree.scala index 416eac5..4a386cf 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/Octree.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/Octree.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialPartitioning +package com.astrolabsoftware.spark3d.spatialPartitioning -import com.spark3d.geometryObjects._ -import com.spark3d.geometryObjects.Shape3D.Shape3D +import com.astrolabsoftware.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D.Shape3D import scala.util.control.Breaks._ import scala.collection.mutable.ListBuffer diff --git a/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioner.scala b/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioner.scala index 4218bdc..8d023c3 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioner.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioner.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialPartitioning +package com.astrolabsoftware.spark3d.spatialPartitioning -import com.spark3d.geometryObjects.BoxEnvelope -import com.spark3d.geometryObjects.Shape3D.Shape3D +import com.astrolabsoftware.spark3d.geometryObjects.BoxEnvelope +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D.Shape3D import scala.collection.mutable.{HashSet, ListBuffer} diff --git a/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioning.scala b/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioning.scala index d41f9e6..883ca08 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioning.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/OctreePartitioning.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialPartitioning +package com.astrolabsoftware.spark3d.spatialPartitioning -import com.spark3d.geometryObjects.BoxEnvelope -import com.spark3d.geometryObjects.Shape3D.Shape3D +import com.astrolabsoftware.spark3d.geometryObjects.BoxEnvelope +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D.Shape3D import scala.collection.mutable.ListBuffer diff --git a/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioner.scala b/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioner.scala index ba98305..d1c13b1 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioner.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioner.scala @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialPartitioning +package com.astrolabsoftware.spark3d.spatialPartitioning // Scala deps import scala.util.control.Breaks._ import scala.collection.mutable.{HashSet, ListBuffer} // spark3d deps -import com.spark3d.geometryObjects.ShellEnvelope -import com.spark3d.spatialPartitioning -import com.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.geometryObjects.ShellEnvelope +import com.astrolabsoftware.spark3d.spatialPartitioning +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ /** diff --git a/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioning.scala b/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioning.scala index 76ec9a6..e5f4ab2 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioning.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/OnionPartitioning.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialPartitioning +package com.astrolabsoftware.spark3d.spatialPartitioning import org.apache.spark.rdd.RDD -import com.spark3d.geometryObjects.ShellEnvelope -import com.spark3d.geometryObjects.Point3D -import com.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.geometryObjects.ShellEnvelope +import com.astrolabsoftware.spark3d.geometryObjects.Point3D +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ /** * Class to deal with the onion space. diff --git a/src/main/scala/com/spark3d/spatialPartitioning/SpatialPartitioner.scala b/src/main/scala/com/spark3d/spatialPartitioning/SpatialPartitioner.scala index ac6b36b..1e28d6d 100644 --- a/src/main/scala/com/spark3d/spatialPartitioning/SpatialPartitioner.scala +++ b/src/main/scala/com/spark3d/spatialPartitioning/SpatialPartitioner.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialPartitioning +package com.astrolabsoftware.spark3d.spatialPartitioning // Spark built-in partitioner import org.apache.spark.Partitioner // spark3d deps -import com.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ /** * Abstract class for partitioning the 3D space. diff --git a/src/main/scala/com/spark3d/utils/ExtPointing.scala b/src/main/scala/com/spark3d/utils/ExtPointing.scala index 0acd6a8..05518ac 100644 --- a/src/main/scala/com/spark3d/utils/ExtPointing.scala +++ b/src/main/scala/com/spark3d/utils/ExtPointing.scala @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.utils +package com.astrolabsoftware.spark3d.utils import healpix.essentials.Pointing diff --git a/src/main/scala/com/spark3d/utils/GeometryObjectComparator.scala b/src/main/scala/com/spark3d/utils/GeometryObjectComparator.scala index 87f7578..963b045 100644 --- a/src/main/scala/com/spark3d/utils/GeometryObjectComparator.scala +++ b/src/main/scala/com/spark3d/utils/GeometryObjectComparator.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.spark3d.utils +package com.astrolabsoftware.spark3d.utils -import com.spark3d.geometryObjects.Point3D -import com.spark3d.geometryObjects.Shape3D.Shape3D +import com.astrolabsoftware.spark3d.geometryObjects.Point3D +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D.Shape3D class GeometryObjectComparator[A <: Shape3D](val queryObjectCenter: Point3D) extends Ordering[A] { diff --git a/src/main/scala/com/spark3d/utils/GridType.scala b/src/main/scala/com/spark3d/utils/GridType.scala index d2fdd20..6db0c05 100644 --- a/src/main/scala/com/spark3d/utils/GridType.scala +++ b/src/main/scala/com/spark3d/utils/GridType.scala @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.utils +package com.astrolabsoftware.spark3d.utils /** * Define a new enumeration with a type alias diff --git a/src/main/scala/com/spark3d/utils/Utils.scala b/src/main/scala/com/spark3d/utils/Utils.scala index 81a096e..3cd250c 100644 --- a/src/main/scala/com/spark3d/utils/Utils.scala +++ b/src/main/scala/com/spark3d/utils/Utils.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.utils +package com.astrolabsoftware.spark3d.utils -import com.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.geometryObjects._ object Utils { diff --git a/src/test/scala/com/spark3d/geometryObjects/BoxEnvelopeTest.scala b/src/test/scala/com/spark3d/geometryObjects/BoxEnvelopeTest.scala index 4da9b7d..2a761af 100644 --- a/src/test/scala/com/spark3d/geometryObjects/BoxEnvelopeTest.scala +++ b/src/test/scala/com/spark3d/geometryObjects/BoxEnvelopeTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.spark3d.geometryObjects +package com.astrolabsoftware.spark3d.geometryObjects import org.scalatest.{BeforeAndAfterAll, FunSuite} diff --git a/src/test/scala/com/spark3d/geometryObjects/Point3DTest.scala b/src/test/scala/com/spark3d/geometryObjects/Point3DTest.scala index c67a5ee..1d19433 100644 --- a/src/test/scala/com/spark3d/geometryObjects/Point3DTest.scala +++ b/src/test/scala/com/spark3d/geometryObjects/Point3DTest.scala @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.geometryObjects +package com.astrolabsoftware.spark3d.geometryObjects import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.geometryObjects.Shape3D._ -import com.spark3d.utils.Utils.sphericalToCartesian +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.utils.Utils.sphericalToCartesian /** * Dummy class with no specific implementation to test errors diff --git a/src/test/scala/com/spark3d/geometryObjects/Shape3DTest.scala b/src/test/scala/com/spark3d/geometryObjects/Shape3DTest.scala index a597eaa..91dad6a 100644 --- a/src/test/scala/com/spark3d/geometryObjects/Shape3DTest.scala +++ b/src/test/scala/com/spark3d/geometryObjects/Shape3DTest.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.geometryObjects +package com.astrolabsoftware.spark3d.geometryObjects import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.geometryObjects._ -import com.spark3d.geometryObjects.Shape3D._ +import com.astrolabsoftware.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.geometryObjects.Shape3D._ /** * Test class for the Shape3D methods. diff --git a/src/test/scala/com/spark3d/geometryObjects/ShellEnvelopeTest.scala b/src/test/scala/com/spark3d/geometryObjects/ShellEnvelopeTest.scala index 50a7d1b..f028645 100644 --- a/src/test/scala/com/spark3d/geometryObjects/ShellEnvelopeTest.scala +++ b/src/test/scala/com/spark3d/geometryObjects/ShellEnvelopeTest.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.spark3d.geometryObjects +package com.astrolabsoftware.spark3d.geometryObjects import org.scalatest.{BeforeAndAfterAll, FunSuite} diff --git a/src/test/scala/com/spark3d/serialization/Spark3dRegistratorTest.scala b/src/test/scala/com/spark3d/serialization/Spark3dRegistratorTest.scala index 380e23f..9d0447f 100644 --- a/src/test/scala/com/spark3d/serialization/Spark3dRegistratorTest.scala +++ b/src/test/scala/com/spark3d/serialization/Spark3dRegistratorTest.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.serialization +package com.astrolabsoftware.spark3d.serialization -import com.spark3d.serialization.Spark3dConf.spark3dConf +import com.astrolabsoftware.spark3d.serialization.Spark3dConf.spark3dConf import org.scalatest.{BeforeAndAfterAll, FunSuite} diff --git a/src/test/scala/com/spark3d/spatial3DRDD/LoaderTest.scala b/src/test/scala/com/spark3d/spatial3DRDD/LoaderTest.scala index 4f62f1e..a6bba0f 100644 --- a/src/test/scala/com/spark3d/spatial3DRDD/LoaderTest.scala +++ b/src/test/scala/com/spark3d/spatial3DRDD/LoaderTest.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatial3DRDD +package com.astrolabsoftware.spark3d.spatial3DRDD import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.geometryObjects.Point3D -import com.spark3d.spatial3DRDD._ +import com.astrolabsoftware.spark3d.geometryObjects.Point3D +import com.astrolabsoftware.spark3d.spatial3DRDD._ import org.apache.spark.sql.SparkSession import org.apache.spark.sql.types._ diff --git a/src/test/scala/com/spark3d/spatial3DRDD/Point3DRDDTest.scala b/src/test/scala/com/spark3d/spatial3DRDD/Point3DRDDTest.scala index fb1f638..65c3809 100644 --- a/src/test/scala/com/spark3d/spatial3DRDD/Point3DRDDTest.scala +++ b/src/test/scala/com/spark3d/spatial3DRDD/Point3DRDDTest.scala @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatial3DRDD +package com.astrolabsoftware.spark3d.spatial3DRDD import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.geometryObjects.Point3D -import com.spark3d.utils.GridType -import com.spark3d.spatial3DRDD._ -import com.spark3d.spatialPartitioning.SpatialPartitioner +import com.astrolabsoftware.spark3d.geometryObjects.Point3D +import com.astrolabsoftware.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatial3DRDD._ +import com.astrolabsoftware.spark3d.spatialPartitioning.SpatialPartitioner import org.apache.spark.sql.SparkSession import org.apache.spark.sql.types._ diff --git a/src/test/scala/com/spark3d/spatial3DRDD/SphereRDDTest.scala b/src/test/scala/com/spark3d/spatial3DRDD/SphereRDDTest.scala index 0a455b6..7347bcc 100644 --- a/src/test/scala/com/spark3d/spatial3DRDD/SphereRDDTest.scala +++ b/src/test/scala/com/spark3d/spatial3DRDD/SphereRDDTest.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatial3DRDD +package com.astrolabsoftware.spark3d.spatial3DRDD import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.geometryObjects.{BoxEnvelope, ShellEnvelope} -import com.spark3d.utils.GridType -import com.spark3d.spatial3DRDD._ -import com.spark3d.spatialPartitioning.{Octree, OctreePartitioner, OctreePartitioning, SpatialPartitioner} +import com.astrolabsoftware.spark3d.geometryObjects.{BoxEnvelope, ShellEnvelope} +import com.astrolabsoftware.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatial3DRDD._ +import com.astrolabsoftware.spark3d.spatialPartitioning.{Octree, OctreePartitioner, OctreePartitioning, SpatialPartitioner} import org.apache.spark.sql.SparkSession import org.apache.spark.sql.types._ import org.apache.spark.sql.functions._ diff --git a/src/test/scala/com/spark3d/spatialOperator/CenterCrossMatchTest.scala b/src/test/scala/com/spark3d/spatialOperator/CenterCrossMatchTest.scala index 3e6b33e..41d0b07 100644 --- a/src/test/scala/com/spark3d/spatialOperator/CenterCrossMatchTest.scala +++ b/src/test/scala/com/spark3d/spatialOperator/CenterCrossMatchTest.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialOperator +package com.astrolabsoftware.spark3d.spatialOperator import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.utils.GridType -import com.spark3d.spatial3DRDD._ -import com.spark3d.spatialPartitioning.SpatialPartitioner +import com.astrolabsoftware.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatial3DRDD._ +import com.astrolabsoftware.spark3d.spatialPartitioning.SpatialPartitioner import org.apache.spark.sql.SparkSession import org.apache.spark.sql.types._ diff --git a/src/test/scala/com/spark3d/spatialOperator/PixelCrossMatchTest.scala b/src/test/scala/com/spark3d/spatialOperator/PixelCrossMatchTest.scala index 58f77b6..32cb627 100644 --- a/src/test/scala/com/spark3d/spatialOperator/PixelCrossMatchTest.scala +++ b/src/test/scala/com/spark3d/spatialOperator/PixelCrossMatchTest.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialOperator +package com.astrolabsoftware.spark3d.spatialOperator import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.utils.GridType -import com.spark3d.spatial3DRDD._ -import com.spark3d.spatialPartitioning.SpatialPartitioner +import com.astrolabsoftware.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatial3DRDD._ +import com.astrolabsoftware.spark3d.spatialPartitioning.SpatialPartitioner import org.apache.spark.sql.SparkSession import org.apache.spark.sql.types._ diff --git a/src/test/scala/com/spark3d/spatialOperator/RangeQueryTest.scala b/src/test/scala/com/spark3d/spatialOperator/RangeQueryTest.scala index 9fe9a6a..5f95c2b 100644 --- a/src/test/scala/com/spark3d/spatialOperator/RangeQueryTest.scala +++ b/src/test/scala/com/spark3d/spatialOperator/RangeQueryTest.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialOperator +package com.astrolabsoftware.spark3d.spatialOperator import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.spatial3DRDD._ -import com.spark3d.geometryObjects.ShellEnvelope -import com.spark3d.geometryObjects.Point3D +import com.astrolabsoftware.spark3d.spatial3DRDD._ +import com.astrolabsoftware.spark3d.geometryObjects.ShellEnvelope +import com.astrolabsoftware.spark3d.geometryObjects.Point3D import org.apache.spark.sql.SparkSession import org.apache.spark.sql.types._ diff --git a/src/test/scala/com/spark3d/spatialOperator/SpatialQueryTest.scala b/src/test/scala/com/spark3d/spatialOperator/SpatialQueryTest.scala index 860b92d..5461b82 100644 --- a/src/test/scala/com/spark3d/spatialOperator/SpatialQueryTest.scala +++ b/src/test/scala/com/spark3d/spatialOperator/SpatialQueryTest.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.spark3d.spatialOperator +package com.astrolabsoftware.spark3d.spatialOperator import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.spatial3DRDD._ -import com.spark3d.geometryObjects.{Point3D, ShellEnvelope} -import com.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatial3DRDD._ +import com.astrolabsoftware.spark3d.geometryObjects.{Point3D, ShellEnvelope} +import com.astrolabsoftware.spark3d.utils.GridType import org.apache.spark.sql.SparkSession import org.apache.log4j.Level import org.apache.log4j.Logger diff --git a/src/test/scala/com/spark3d/spatialPartitioning/OctreePartitionerTest.scala b/src/test/scala/com/spark3d/spatialPartitioning/OctreePartitionerTest.scala index b0b374d..d9a3c0c 100644 --- a/src/test/scala/com/spark3d/spatialPartitioning/OctreePartitionerTest.scala +++ b/src/test/scala/com/spark3d/spatialPartitioning/OctreePartitionerTest.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialPartitioning +package com.astrolabsoftware.spark3d.spatialPartitioning import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.geometryObjects._ import scala.collection.mutable.ListBuffer diff --git a/src/test/scala/com/spark3d/spatialPartitioning/OctreeTest.scala b/src/test/scala/com/spark3d/spatialPartitioning/OctreeTest.scala index 44a31e2..438cfb1 100644 --- a/src/test/scala/com/spark3d/spatialPartitioning/OctreeTest.scala +++ b/src/test/scala/com/spark3d/spatialPartitioning/OctreeTest.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialPartitioning +package com.astrolabsoftware.spark3d.spatialPartitioning -import com.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.geometryObjects._ import org.scalatest.{BeforeAndAfterAll, FunSuite} import scala.collection.mutable.ListBuffer diff --git a/src/test/scala/com/spark3d/spatialPartitioning/OnionPartitionerTest.scala b/src/test/scala/com/spark3d/spatialPartitioning/OnionPartitionerTest.scala index f647a96..54d7157 100644 --- a/src/test/scala/com/spark3d/spatialPartitioning/OnionPartitionerTest.scala +++ b/src/test/scala/com/spark3d/spatialPartitioning/OnionPartitionerTest.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.spatialPartitioning +package com.astrolabsoftware.spark3d.spatialPartitioning import org.scalatest.{BeforeAndAfterAll, FunSuite} -import com.spark3d.spatialPartitioning._ -import com.spark3d.geometryObjects._ -import com.spark3d.utils.GridType +import com.astrolabsoftware.spark3d.spatialPartitioning._ +import com.astrolabsoftware.spark3d.geometryObjects._ +import com.astrolabsoftware.spark3d.utils.GridType class OnionPartitionerTest extends FunSuite with BeforeAndAfterAll { diff --git a/src/test/scala/com/spark3d/utils/GridTypeTest.scala b/src/test/scala/com/spark3d/utils/GridTypeTest.scala index 0729b0d..086b85e 100644 --- a/src/test/scala/com/spark3d/utils/GridTypeTest.scala +++ b/src/test/scala/com/spark3d/utils/GridTypeTest.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.utils +package com.astrolabsoftware.spark3d.utils -import com.spark3d.utils._ +import com.astrolabsoftware.spark3d.utils._ import org.scalatest.{BeforeAndAfterAll, FunSuite} diff --git a/src/test/scala/com/spark3d/utils/UtilsTest.scala b/src/test/scala/com/spark3d/utils/UtilsTest.scala index 95c36d6..196400c 100644 --- a/src/test/scala/com/spark3d/utils/UtilsTest.scala +++ b/src/test/scala/com/spark3d/utils/UtilsTest.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.spark3d.utils +package com.astrolabsoftware.spark3d.utils -import com.spark3d.utils.Utils._ -import com.spark3d.geometryObjects.Point3D +import com.astrolabsoftware.spark3d.utils.Utils._ +import com.astrolabsoftware.spark3d.geometryObjects.Point3D import org.scalatest.{BeforeAndAfterAll, FunSuite}