Bind more functions

DillonZChen · Jan 20, 2025 · 0fd5f25 · 0fd5f25
1 parent 44c5e17
commit 0fd5f25
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/include/feature_generation/features.hpp b/include/feature_generation/features.hpp
@@ -80,9 +80,6 @@ namespace feature_generation {
     // for iteration j = 0, ..., iterations - 1
     std::vector<std::vector<long>> seen_colour_statistics;
 
-    // convert states to graphs
-    std::vector<graph::Graph> convert_to_graphs(const data::Dataset dataset);
-
     // get hashed colour if it exists, and constructs it if it doesn't
     int get_colour_hash(const std::vector<int> &colour, const int iteration);
 
@@ -115,6 +112,9 @@ namespace feature_generation {
 
     /* Feature generation functions */
 
+    // convert states to graphs
+    std::vector<graph::Graph> convert_to_graphs(const data::Dataset dataset);
+
     // collect training colours
     void collect_from_dataset(const data::Dataset dataset);
     void collect(const std::vector<graph::Graph> &graphs);

diff --git a/include/feature_generation/pruning_options.hpp b/include/feature_generation/pruning_options.hpp
@@ -1,5 +1,5 @@
-#ifndef FEATURE_GENERATION_PRUNING_OPTIONS_HPP
-#define FEATURE_GENERATION_PRUNING_OPTIONS_HPP
+#ifndef FEATURE_GENERATION_FEATURE_PRUNING_OPTIONS_HPP
+#define FEATURE_GENERATION_FEATURE_PRUNING_OPTIONS_HPP
 
 #include <string>
 #include <vector>
@@ -16,4 +16,4 @@ namespace feature_generation {
   };
 }  // namespace feature_generation
 
-#endif  // FEATURE_GENERATION_PRUNING_OPTIONS_HPP
+#endif  // FEATURE_GENERATION_FEATURE_PRUNING_OPTIONS_HPP
diff --git a/src/main.cpp b/src/main.cpp
@@ -457,6 +457,8 @@ py::class_<feature_generation::Features>(feature_generation_m, "_Features")
         "dataset"_a)
   .def("collect", py::overload_cast<const std::vector<graph::Graph> &>(&feature_generation::Features::collect),
         "graphs"_a)
+  .def("convert_to_graphs", &feature_generation::Features::convert_to_graphs, 
+        "dataset"_a)
   .def("set_problem", &feature_generation::Features::set_problem,
         "problem"_a)
   .def("get_string_representation", py::overload_cast<const feature_generation::Embedding &>(&feature_generation::Features::get_string_representation),
@@ -467,6 +469,8 @@ py::class_<feature_generation::Features>(feature_generation_m, "_Features")
         "dataset"_a)
   .def("embed", py::overload_cast<const std::vector<graph::Graph> &>(&feature_generation::Features::embed_graphs),
         "graphs"_a)
+  .def("embed", py::overload_cast<const graph::Graph &>(&feature_generation::Features::embed_graph),
+        "graph"_a)
   .def("embed", py::overload_cast<const planning::State &>(&feature_generation::Features::embed_state),
         "state"_a)
   .def("get_n_features", &feature_generation::Features::get_n_features)