feat(Lib): create lib to manage stochastic geometry.

francoisbonneau · francoisbonneau · commit 7d1fe6243a54 · 2025-06-03T22:28:22.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,20 +31,9 @@ option(OPENGEODE_STOCHASTIC_WITH_PYTHON "Compile Python bindings" OFF)
 # Get MyModule dependencies
 find_package(OpenGeode REQUIRED CONFIG)
 
-#------------------------------------------------------------------------------------------------
-# Configure the MyModule libraries
-add_geode_library(
-    NAME mylib
-    FOLDER "mylib"
-    SOURCES
-        "common.cpp"
-        "hello_world.cpp"
-    PUBLIC_HEADERS
-        "common.hpp"
-        "hello_world.hpp"
-    PRIVATE_DEPENDENCIES
-        OpenGeode::basic
-)
+# ------------------------------------------------------------------------------------------------
+# Configure the OpenGeode-Stochastic libraries
+add_subdirectory(src/geode/stochastic)
 
 #------------------------------------------------------------------------------------------------
 # Optional modules configuration
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -29,7 +29,7 @@ add_geode_python_wheel(
     DESCRIPTION 
         "A module of the OpenGeode framework for stochastic modeling, simulation and bayesian inference"
     MODULES
-        "mylib.py"
+        "geometry.py"
     LICENSE "MIT"
 )
 
diff --git a/bindings/python/geometry.py b/bindings/python/geometry.py
@@ -4,5 +4,6 @@
 
 import opengeode
 
-from opengeode_stochastic_py_mylib import *
-StochasticMyLibLibrary.initialize()
+from opengeode_stochastic_py_geometry import *
+
+StochasticGeometryLibrary.initialize()
diff --git a/bindings/python/src/CMakeLists.txt b/bindings/python/src/CMakeLists.txt
@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-add_subdirectory(mylib)
+add_subdirectory(geometry)
diff --git a/bindings/python/src/geometry/CMakeLists.txt b/bindings/python/src/geometry/CMakeLists.txt
@@ -19,9 +19,9 @@
 # SOFTWARE.
 
 add_geode_python_binding(
-    NAME "py_mylib"
+    NAME "py_geometry"
     SOURCES
-        "mylib.cpp"
+        "geometry.cpp"
     DEPENDENCIES
-        ${PROJECT_NAME}::mylib
+        ${PROJECT_NAME}::geometry
 )
diff --git a/bindings/python/src/geometry/geometry.cpp b/bindings/python/src/geometry/geometry.cpp
@@ -23,13 +23,13 @@
 
 #include <pybind11/pybind11.h>
 
-#include <mylib/hello_world.hpp>
+#include <geode/stochastic/geometry/hello_world.hpp>
 
-PYBIND11_MODULE( opengeode_stochastic_py_mylib, module )
+PYBIND11_MODULE( opengeode_stochastic_py_geometry, module )
 {
-    module.doc() = "OpenGeode-Stochastic Python binding for mylib";
-    pybind11::class_< stochastic::StochasticMyLibLibrary >(
-        module, "StochasticMyLibLibrary" )
-        .def( "initialize", &stochastic::StochasticMyLibLibrary::initialize );
-    module.def( "hello_world", &stochastic::hello_world );
+    module.doc() = "OpenGeode-Stochastic Python binding for geometry";
+    pybind11::class_< geode::StochasticGeometryLibrary >(
+        module, "StochasticGeometryLibrary" )
+        .def( "initialize", &geode::StochasticGeometryLibrary::initialize );
+    module.def( "hello_world", &geode::hello_world );
 }
diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt
@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-add_subdirectory(mylib)
+add_subdirectory(geometry)
diff --git a/bindings/python/tests/geometry/CMakeLists.txt b/bindings/python/tests/geometry/CMakeLists.txt
@@ -21,5 +21,5 @@
 add_geode_python_test(
     SOURCE "test-py-hello-world.py"
     DEPENDENCIES
-        ${PROJECT_NAME}::py_mylib
+        ${PROJECT_NAME}::py_geometry
 )
diff --git a/bindings/python/tests/geometry/test-py-hello-world.py b/bindings/python/tests/geometry/test-py-hello-world.py
@@ -28,7 +28,7 @@
         os.add_dll_directory(path)
 
 import opengeode
-import opengeode_stochastic_py_mylib as mylib
+import opengeode_stochastic_py_geometry as stochgeom
 
 if __name__ == "__main__":
-    mylib.hello_world()
+    stochgeom.hello_world()
diff --git a/cmake/OpenGeode-StochasticConfig.cmake.in b/cmake/OpenGeode-StochasticConfig.cmake.in
@@ -24,4 +24,4 @@ include(CMakeFindDependencyMacro)
 find_dependency(OpenGeode)
 
 # Load information for each target
-include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@_mylib_target.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@_geometry_target.cmake)
diff --git a/include/geode/stochastic/geometry/common.hpp b/include/geode/stochastic/geometry/common.hpp
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2019 - 2025 Geode-solutions. All rights reserved.
+ */
+
+#pragma once
+
+#include <geode/basic/common.hpp>
+#include <geode/basic/library.hpp>
+#include <geode/stochastic/geometry/opengeode_stochastic_geometry_export.hpp>
+
+namespace geode
+{
+    OPENGEODE_LIBRARY( opengeode_stochastic_geometry_api, StochasticGeometry );
+} // namespace geode
diff --git a/include/geode/stochastic/geometry/hello_world.hpp b/include/geode/stochastic/geometry/hello_world.hpp
@@ -23,9 +23,9 @@
 
 #pragma once
 
-#include <mylib/common.hpp>
+#include <geode/stochastic/geometry/common.hpp>
 
-namespace stochastic
+namespace geode
 {
-    bool opengeode_stochastic_mylib_api hello_world();
-} // namespace stochastic
+    bool opengeode_stochastic_geometry_api hello_world();
+} // namespace geode
diff --git a/include/mylib/common.hpp b/include/mylib/common.hpp
diff --git a/src/geode/stochastic/CMakeLists.txt b/src/geode/stochastic/CMakeLists.txt
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2019 - 2025 Geode-solutions. All rights reserved.
+#
+
+add_subdirectory(geometry)
diff --git a/src/geode/stochastic/geometry/CMakeLists.txt b/src/geode/stochastic/geometry/CMakeLists.txt
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2019 - 2025 Geode-solutions. All rights reserved.
+#
+
+add_geode_library(
+    NAME geometry
+    FOLDER "geode/stochastic/geometry"
+    SOURCES
+        "common.cpp"
+        "hello_world.cpp"
+    PUBLIC_HEADERS
+        "common.hpp"
+        "hello_world.hpp"
+    PRIVATE_DEPENDENCIES
+        OpenGeode::basic
+        OpenGeode::geometry
+
+)
diff --git a/src/geode/stochastic/geometry/common.cpp b/src/geode/stochastic/geometry/common.cpp
@@ -21,17 +21,19 @@
  *
  */
 
-#include <mylib/common.hpp>
+#include <geode/stochastic/geometry/common.hpp>
 
 #include <geode/basic/library.hpp>
+#include <geode/geometry/common.hpp>
 
-namespace stochastic
+namespace geode
 {
-    OPENGEODE_LIBRARY_IMPLEMENTATION( StochasticMyLib )
+    OPENGEODE_LIBRARY_IMPLEMENTATION( StochasticGeometry )
     {
         /* Here the functions to call when initializing the library
          * For exemple: registers, ...
          */
         geode::OpenGeodeBasicLibrary::initialize();
+        geode::OpenGeodeGeometryLibrary::initialize();
     }
-} // namespace stochastic
+} // namespace geode
diff --git a/src/geode/stochastic/geometry/hello_world.cpp b/src/geode/stochastic/geometry/hello_world.cpp
@@ -21,15 +21,15 @@
  *
  */
 
-#include <mylib/hello_world.hpp>
+#include <geode/stochastic/geometry/hello_world.hpp>
 
 #include <geode/basic/logger.hpp>
 
-namespace stochastic
+namespace geode
 {
     bool hello_world()
     {
         geode::Logger::info( "Hello Geode Stochastic World!" );
         return true;
     }
-} // namespace stochastic
+} // namespace geode
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -20,12 +20,12 @@
 
 cmake_minimum_required(VERSION 3.15)
     
-if(NOT TARGET OpenGeode-Stochastic::mylib)
+if(NOT TARGET OpenGeode-Stochastic::geometry)
     project(OpenGeode-Stochastic CXX)
     find_package(OpenGeode REQUIRED CONFIG)
     find_package(OpenGeode-Stochastic REQUIRED CONFIG)
     enable_testing()
 endif()
 
-add_subdirectory(mylib)
+add_subdirectory(geometry)
 
diff --git a/tests/geometry/CMakeLists.txt b/tests/geometry/CMakeLists.txt
@@ -22,5 +22,5 @@ add_geode_test(
     SOURCE "test-hello-world.cpp"
     DEPENDENCIES
         OpenGeode::basic
-        ${PROJECT_NAME}::mylib
+        ${PROJECT_NAME}::geometry
 )
diff --git a/tests/geometry/test-hello-world.cpp b/tests/geometry/test-hello-world.cpp
@@ -24,14 +24,14 @@
 #include <geode/basic/assert.hpp>
 #include <geode/basic/logger.hpp>
 
-#include <mylib/hello_world.hpp>
+#include <geode/stochastic/geometry/hello_world.hpp>
 
 int main()
 {
     try
     {
-        stochastic::StochasticMyLibLibrary::initialize();
-        OPENGEODE_EXCEPTION( stochastic::hello_world(),
+        geode::StochasticGeometryLibrary::initialize();
+        OPENGEODE_EXCEPTION( geode::hello_world(),
             "[Test] Hello Stochastic World is not correct" );
 
         geode::Logger::info( "TEST SUCCESS" );

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ add_geode_python_wheel(`
`29`	`29`	`DESCRIPTION`
`30`	`30`	`"A module of the OpenGeode framework for stochastic modeling, simulation and bayesian inference"`
`31`	`31`	`MODULES`
`32`		`- "mylib.py"`
	`32`	`+ "geometry.py"`
`33`	`33`	`LICENSE "MIT"`
`34`	`34`	`)`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@`
`21`	`21`	`add_geode_python_test(`
`22`	`22`	`SOURCE "test-py-hello-world.py"`
`23`	`23`	`DEPENDENCIES`
`24`		`- ${PROJECT_NAME}::py_mylib`
	`24`	`+ ${PROJECT_NAME}::py_geometry`
`25`	`25`	`)`