Use all-caps for saved file names to avoid conflicts with custom files.

Also change the save_name variable to be consistent with those in knncolle.

Bumped version for a new release.

Author: LTLA

include/knncolle_annoy/Annoy.hpp

@@ -22,6 +22,11 @@
 
 namespace knncolle_annoy {
 
+/**
+ * Name of the Annoy algorithm when registering a loading function to `knncolle::load_prebuilt_registry()`.
+ */
+inline static constexpr const char* annoy_prebuilt_save_name = "knncolle_annoy::Annoy";
+
 /**
  * @brief Options for `AnnoyBuilder()`. 
  */
@@ -323,18 +328,18 @@ class AnnoyPrebuilt final : public knncolle::Prebuilt<Index_, Data_, Distance_>
 
 public:
     void save(const std::string& prefix) const {
-        knncolle::quick_save(prefix + "ALGORITHM", save_name, std::strlen(save_name));
-        knncolle::quick_save(prefix + "num_obs", &my_obs, 1);
-        knncolle::quick_save(prefix + "num_dim", &my_dim, 1);
-        knncolle::quick_save(prefix + "search_mult", &my_search_mult, 1);
+        knncolle::quick_save(prefix + "ALGORITHM", annoy_prebuilt_save_name, std::strlen(annoy_prebuilt_save_name));
+        knncolle::quick_save(prefix + "NUM_OBS", &my_obs, 1);
+        knncolle::quick_save(prefix + "NUM_DIM", &my_dim, 1);
+        knncolle::quick_save(prefix + "SEARCH_MULT", &my_search_mult, 1);
 
         knncolle::NumericType types[2];
         types[0] = knncolle::get_numeric_type<AnnoyIndex_>();
         types[1] = knncolle::get_numeric_type<AnnoyData_>();
-        knncolle::quick_save(prefix + "types", types, 2);
+        knncolle::quick_save(prefix + "TYPES", types, 2);
 
         const auto dname = get_distance_name<AnnoyDistance_>();
-        knncolle::quick_save(prefix + "distance", dname, std::strlen(dname));
+        knncolle::quick_save(prefix + "DISTANCE", dname, std::strlen(dname));
 
         // Handling custom Annoy types. 
         auto& icust = custom_save_for_annoy_index<AnnoyIndex_>(); 
@@ -357,15 +362,15 @@ class AnnoyPrebuilt final : public knncolle::Prebuilt<Index_, Data_, Distance_>
 
         // For reasons unknown to us, AnnoyIndex::save() is not const, so we have to do it manually.
         // Hopefully this will be fixed in the future.
-        const auto idxpath = prefix + "index";
+        const auto idxpath = prefix + "INDEX";
         knncolle::quick_save(idxpath, reinterpret_cast<char*>(my_index.get_nodes()), sanisizer::product<std::streamsize>(my_index.get_s(), my_index.get_n_nodes()));
     }
 
     AnnoyPrebuilt(const std::string prefix, std::size_t ndim) : my_dim(ndim), my_index(ndim) {
-        knncolle::quick_load(prefix + "num_obs", &my_obs, 1);
-        knncolle::quick_load(prefix + "search_mult", &my_search_mult, 1);
+        knncolle::quick_load(prefix + "NUM_OBS", &my_obs, 1);
+        knncolle::quick_load(prefix + "SEARCH_MULT", &my_search_mult, 1);
 
-        const auto idxpath = prefix + "index";
+        const auto idxpath = prefix + "INDEX";
         char* errbuf = NULL;
         if (!my_index.load(idxpath.c_str(), true, &errbuf)) {
             std::runtime_error ex(errbuf);

include/knncolle_annoy/load_annoy_prebuilt.hpp

@@ -48,12 +48,12 @@ struct AnnoyPrebuiltTypes {
  */
 inline AnnoyPrebuiltTypes load_annoy_prebuilt_types(const std::string& prefix) {
     knncolle::NumericType types[2];
-    knncolle::quick_load(prefix + "types", types, 2);
+    knncolle::quick_load(prefix + "TYPES", types, 2);
 
     AnnoyPrebuiltTypes config;
     config.index = types[0];
     config.data = types[1];
-    config.distance = knncolle::quick_load_as_string(prefix + "distance");
+    config.distance = knncolle::quick_load_as_string(prefix + "DISTANCE");
 
     return config;
 }
@@ -105,7 +105,7 @@ template<
 >
 auto load_annoy_prebuilt(const std::string& prefix) {
     std::size_t ndim;
-    knncolle::quick_load(prefix + "num_dim", &ndim, 1);
+    knncolle::quick_load(prefix + "NUM_DIM", &ndim, 1);
     return new AnnoyPrebuilt<Index_, Data_, Distance_, AnnoyDistance_, AnnoyIndex_, AnnoyData_, AnnoyRng_, AnnoyThreadPolicy_>(prefix, ndim);
 }
 

include/knncolle_annoy/utils.hpp

@@ -17,12 +17,6 @@
 
 namespace knncolle_annoy {
 
-/**
- * Name to store in the `ALGORITHM` file for Annoy `knncolle::Prebuilt` instances,
- * see `knncolle::Prebuilt::save()` for details.
- */
-inline static const char* save_name = "knncolle_annoy::Annoy";
-
 /**
  * @cond
  */