Optimisations and fixes

* Enable LTO for the indexer * Add a missing unwrap while serializing an index.
Dependencies updates, new features, code cleanup
2020-01-31 09:20:09 +01:00 · 2020-01-21 11:21:38 +01:00 · 2019-11-14 16:05:25 +01:00 · 2019-11-14 15:33:19 +01:00 · 2019-11-13 10:30:25 +01:00 · 2019-10-31 15:21:51 +01:00
18 changed files with 570 additions and 593 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,12 +19,6 @@
 [submodule "ironsea_store_file"]
 	path = ironsea_store_file
 	url = ../ironsea_store_file
-[submodule "ironsea_table"]
-	path = ironsea_table
-	url = ../ironsea_table
-[submodule "ironsea_table_vector"]
-	path = ironsea_table_vector
-	url = ../ironsea_table_vector
 [submodule "mercator_data_generator"]
 	path = mercator_data_generator
 	url = ../mercator_data_generator
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,28 +11,28 @@ members = [
    # Generic Interfaces
    "ironsea_index",
    "ironsea_store",
-    "ironsea_table",

    # Specific implementations
    "ironsea_index_hashmap",
    "ironsea_index_sfc_dbc",
-    "ironsea_store_buffered_file",
-    "ironsea_store_file",
-    "ironsea_store_mapped_file",
-    "ironsea_table_vector",
+    #"ironsea_store_buffered_file",
+    #"ironsea_store_file",
+    #"ironsea_store_mapped_file",
 ]

+[profile.release]
+lto = true
+#debug = true
+
 [patch.crates-io]
 mercator_db = { path = "mercator_db" }
 mercator_parser = { path = "mercator_parser" }

 ironsea_index = { path = "ironsea_index" }
 ironsea_store = { path = "ironsea_store" }
-ironsea_table = { path = "ironsea_table" }

 ironsea_index_hashmap = { path = "ironsea_index_hashmap" }
 ironsea_index_sfc_dbc = { path = "ironsea_index_sfc_dbc" }
-ironsea_store_buffered_file = { path = "ironsea_store_buffered_file" }
-ironsea_store_file = { path = "ironsea_store_file" }
-ironsea_store_mapped_file = { path = "ironsea_store_mapped_file" }
-ironsea_table_vector = { path = "ironsea_table_vector" }
+#ironsea_store_buffered_file = { path = "ironsea_store_buffered_file" }
+#ironsea_store_file = { path = "ironsea_store_file" }
+#ironsea_store_mapped_file = { path = "ironsea_store_mapped_file" }
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ This enables the index implementations to be agnostic from the underlying data s
 * Clone the workspace, which will take care of bringing all the repositories needed.

   ```sh
-   git clone --recurse git@gitlab.epfl.ch:DIAS/PROJECTS/HBP-SP5/mercator.git
+   git clone --recurse <repository URI>
   ```

   The following steps assume the working directory is the root of the mercator repository.
@@ -39,17 +39,22 @@ This enables the index implementations to be agnostic from the underlying data s
   cargo run --release -- 1 10 100
   ```

- * Index the data:
+ * Link the data in the indexer folder (It has to be in the current working directory when calling the indexer):

   ```sh
   cd mercator_indexer
   for f in ../mercator_data_generator/1*.json
   do
-   	    ln -s $f
+       ln -s $f
   done
+   ```
+
+ * Index the data:
+
+   ```sh
   cargo run --release -- 1k 10k 100k
   ```
-   
+
 * Run the Spatial Index, while providing the path to the datasets.

   ```sh
@@ -62,7 +67,7 @@ This enables the index implementations to be agnostic from the underlying data s

 ## Documentation

-For more information, please refer to the [documentation](https://epfl-dias.github.io/PROJECT_NAME/).
+For more information, please refer to the [documentation](https://epfl-dias.github.io/mercator/).

 If you want to build the documentation and access it locally, you can use:

--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/1
+++ b/1
--- a/1
+++ b/1
--- a/1
+++ b/1
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Lionel Sambuc	5244bfeef9	Optimisations and fixes * Enable LTO for the indexer * Add a missing unwrap while serializing an index.	2020-01-31 09:20:09 +01:00
Lionel Sambuc	e75debc2fb	Dependencies updates, new features, code cleanup * Removed unused local crates ironsea_store_* * Updated dependencies * Added whenever possible '#![forbid(unsafe_code)]' annotations * Added support for MeshViewer XYZ format * Improved JSON efficiency by making more succinct. * Code cleanup to reduce the number of clippy warnings	2020-01-21 11:21:38 +01:00
Lionel Sambuc	2629310330	Update to latest version of dependences.	2019-11-14 16:05:25 +01:00
Lionel Sambuc	12457de029	Optimisations	2019-11-14 15:33:19 +01:00
Lionel Sambuc	1fa62e485b	Clarifications in the quickstart guide	2019-11-13 10:30:25 +01:00
Lionel Sambuc	6d93a031e6	Reducing again the number of allocations	2019-10-31 15:21:51 +01:00
Lionel Sambuc	ff96c95dcf	Remove forgotten Table references	2019-10-30 22:20:08 +01:00
Lionel Sambuc	a545d6b03d	Index API updates * Reduce the number of allocations * Remove Table & VectorTable crates	2019-10-30 21:42:04 +01:00
Lionel Sambuc	8f796b819d	Enable Link Time Optimisations (LTO)	2019-10-30 15:31:09 +01:00
Lionel Sambuc	136e5b42b6	Fix documentation	2019-10-23 10:39:08 +02:00
Lionel Sambuc	c4b2bd2fe2	Adding features * Support for multi-resolution indexes * Support for ViewPort as an extra parameter to automatically select the index resolution * Take into account axis units while converting between spaces.	2019-10-18 12:31:51 +02:00
Lionel Sambuc	0944f8f436	Fix indexing & Documentation updates	2019-10-10 15:34:00 +02:00
Lionel Sambuc	4cbbdd9b97	Don't forget to initialize cells[0]	2019-10-09 22:05:22 +02:00
Lionel Sambuc	2d6ac152b6	USe HashSet to build dictionnaries	2019-10-09 21:31:08 +02:00