zonoopt 2.2.0__tar.gz → 2.3.0__tar.gz

{zonoopt-2.2.0 → zonoopt-2.3.0}/CMakeLists.txt

@@ -36,7 +36,7 @@ if (ZONOOPT_BUILD_PYTHON_BINDINGS)
     set(TARGET_VAR _core)
 else()
     project(ZonoOpt
-            VERSION 2.2.0
+            VERSION 2.3.0
             LANGUAGES CXX
     )
     set(TARGET_VAR ZonoOpt)
@@ -66,7 +66,7 @@ if (NOT TARGET Eigen3::Eigen)
     message(FATAL_ERROR "Failed to fetch Eigen dependency.")
 endif()
 
-
+# Boost dependency
 function(fetch_boost_lib name repo)
   FetchContent_Declare(
     boost_${name}
@@ -110,6 +110,22 @@ if (NOT TARGET ${boost_handle})
     message(FATAL_ERROR "Failed to fetch Boost dependency.")
 endif()
 
+# json dependency
+find_package(nlohmann_json 3.10 CONFIG QUIET)
+if (NOT nlohmann_json_FOUND)
+    if (ZONOOPT_INSTALL)
+        message(FATAL_ERROR "nlohmann_json not found on system. Required for ZONOOPT_INSTALL.")
+    else()
+        message(STATUS "nlohmann_json not found, fetching 3.12.0 via FetchContent...")
+        FetchContent_Declare(
+                nlohmann_json
+                GIT_REPOSITORY https://github.com/nlohmann/json.git
+                GIT_TAG v3.12.0
+        )
+        FetchContent_MakeAvailable(nlohmann_json)
+    endif()
+endif()
+
 # python dependencies
 if (ZONOOPT_BUILD_PYTHON_BINDINGS)
     # Find the module development requirements (requires FindPython from 3.17 or
@@ -132,6 +148,7 @@ set(SOURCE_FILES
     src/Box.cpp
     src/IntervalMatrix.cpp
     src/BranchAndBound.cpp
+    src/ZonoJson.cpp
 )
 
 # build
@@ -158,9 +175,10 @@ else()
     )
 endif()
 
-# link Eigen and Boost
+# link dependencies
 target_link_libraries(${TARGET_VAR} PUBLIC Eigen3::Eigen)
 target_link_libraries(${TARGET_VAR} PUBLIC ${boost_handle})
+target_link_libraries(${TARGET_VAR} PUBLIC nlohmann_json::nlohmann_json)
 
 # include directories
 target_include_directories(${TARGET_VAR} PUBLIC

{zonoopt-2.2.0 → zonoopt-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: zonoopt
-Version: 2.2.0
+Version: 2.3.0
 Summary: Python bindings for the ZonoOpt C++ library
 Author-Email: Joshua Robbins <jrobbins@psu.edu>
 Classifier: Development Status :: 4 - Beta
@@ -81,13 +81,14 @@ For cases where numerical optimization is required, e.g., checking if a set is e
 constraints are represented as a zonotopic set, custom optimization routines are utilized. 
 Some key features of the ZonoOpt library are as follows:
 - All classes and methods are implemented using sparse linear algebra via the Eigen library.
-- ZonoOpt has no external dependencies beyond Eigen and Boost, making it easy to integrate into robotics projects using C++ or Python.
+- ZonoOpt has minimal external dependencies, making it easy to integrate into robotics projects using C++ or Python.
+  - Dependencies are Eigen, Boost, and nlohmann/json
 - Polymorphism is used to provide a common interface for zonotopes, constrained zonotopes, and hybrid zonotopes while allowing for specialized implementations.
   - E.g., `support` is more efficient for zonotopes than for constrained zonotopes. 
 - Factors are flexibly defined as either $[\xi_c \quad \xi_b]^T \in [0,1]^{nGc} \times \lbrace 0,1 \rbrace^{nGb}$ or the more standard form $[\xi_c \quad \xi_b]^T \in [-1,1]^{nGc} \times \lbrace -1,1 \rbrace^{nGb}$ to facilitate certain set operations.
 - Interval arithmetic is provided via the `Interval`, `Box`, and `IntervalMatrix` classes. 
   - Boost's interval library is used within `Interval` for most of the fundamental operations.
-- Operator overloading for commonly-used set operations.
+- Operator overloading is implemented for commonly-used set operations.
 
 ## Building and Installing
 Python bindings can be installed from PyPI with `pip install zonoopt`. To build the bindings from source, use `pip install .`. Note that a C++ compiler is required to build from source.
@@ -240,5 +241,11 @@ More information about ZonoOpt can be found in the following publications. Pleas
 
 **Robbins, J.A., Thompson, A.F., Glunt, J.J., and Pangborn, H.C., "Hybrid System Planning using a Mixed-Integer ADMM Heuristic and Hybrid Zonotopes", 2026. [https://arxiv.org/abs/2602.17574](https://doi.org/10.48550/arXiv.2602.17574)**
 
+## A Note on Version Numbers
+For internal reasons, ZonoOpt's versioning begins at 2.0.0. 
+
+Please note that the library is currently in Beta. In this phase, there may be API changes in minor version updates (e.g., 2.1.0 to 2.2.0). 
+There will be no API changes between patch numbers (e.g., 2.2.0 to 2.2.1).
+
 ## See Also
 For MATLAB users, [zonoLAB](https://github.com/ESCL-at-UTD/zonoLAB) provides classes and set operations for zonotopes, constrained zonotopes, and hybrid zonotopes.

{zonoopt-2.2.0 → zonoopt-2.3.0}/README.md

@@ -62,13 +62,14 @@ For cases where numerical optimization is required, e.g., checking if a set is e
 constraints are represented as a zonotopic set, custom optimization routines are utilized. 
 Some key features of the ZonoOpt library are as follows:
 - All classes and methods are implemented using sparse linear algebra via the Eigen library.
-- ZonoOpt has no external dependencies beyond Eigen and Boost, making it easy to integrate into robotics projects using C++ or Python.
+- ZonoOpt has minimal external dependencies, making it easy to integrate into robotics projects using C++ or Python.
+  - Dependencies are Eigen, Boost, and nlohmann/json
 - Polymorphism is used to provide a common interface for zonotopes, constrained zonotopes, and hybrid zonotopes while allowing for specialized implementations.
   - E.g., `support` is more efficient for zonotopes than for constrained zonotopes. 
 - Factors are flexibly defined as either $[\xi_c \quad \xi_b]^T \in [0,1]^{nGc} \times \lbrace 0,1 \rbrace^{nGb}$ or the more standard form $[\xi_c \quad \xi_b]^T \in [-1,1]^{nGc} \times \lbrace -1,1 \rbrace^{nGb}$ to facilitate certain set operations.
 - Interval arithmetic is provided via the `Interval`, `Box`, and `IntervalMatrix` classes. 
   - Boost's interval library is used within `Interval` for most of the fundamental operations.
-- Operator overloading for commonly-used set operations.
+- Operator overloading is implemented for commonly-used set operations.
 
 ## Building and Installing
 Python bindings can be installed from PyPI with `pip install zonoopt`. To build the bindings from source, use `pip install .`. Note that a C++ compiler is required to build from source.
@@ -221,5 +222,11 @@ More information about ZonoOpt can be found in the following publications. Pleas
 
 **Robbins, J.A., Thompson, A.F., Glunt, J.J., and Pangborn, H.C., "Hybrid System Planning using a Mixed-Integer ADMM Heuristic and Hybrid Zonotopes", 2026. [https://arxiv.org/abs/2602.17574](https://doi.org/10.48550/arXiv.2602.17574)**
 
+## A Note on Version Numbers
+For internal reasons, ZonoOpt's versioning begins at 2.0.0. 
+
+Please note that the library is currently in Beta. In this phase, there may be API changes in minor version updates (e.g., 2.1.0 to 2.2.0). 
+There will be no API changes between patch numbers (e.g., 2.2.0 to 2.2.1).
+
 ## See Also
 For MATLAB users, [zonoLAB](https://github.com/ESCL-at-UTD/zonoLAB) provides classes and set operations for zonotopes, constrained zonotopes, and hybrid zonotopes.

{zonoopt-2.2.0 → zonoopt-2.3.0}/docs/C++/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "ZonoOpt"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "2.2.0"
+PROJECT_NUMBER         = "2.3.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

{zonoopt-2.2.0 → zonoopt-2.3.0}/docs/C++/html/ADMM_8cpp.html

@@ -34,7 +34,7 @@ MathJax.Hub.Config({
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">ZonoOpt<span id="projectnumber">&#160;2.2.0</span>
+   <div id="projectname">ZonoOpt<span id="projectnumber">&#160;2.3.0</span>
    </div>
   </td>
  </tr>

{zonoopt-2.2.0 → zonoopt-2.3.0}/docs/C++/html/ADMM_8hpp.html

@@ -34,7 +34,7 @@ MathJax.Hub.Config({
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">ZonoOpt<span id="projectnumber">&#160;2.2.0</span>
+   <div id="projectname">ZonoOpt<span id="projectnumber">&#160;2.3.0</span>
    </div>
   </td>
  </tr>

{zonoopt-2.2.0 → zonoopt-2.3.0}/docs/C++/html/ADMM_8hpp_source.html

@@ -34,7 +34,7 @@ MathJax.Hub.Config({
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">ZonoOpt<span id="projectnumber">&#160;2.2.0</span>
+   <div id="projectname">ZonoOpt<span id="projectnumber">&#160;2.3.0</span>
    </div>
   </td>
  </tr>

{zonoopt-2.2.0 → zonoopt-2.3.0}/docs/C++/html/BnbDataStructures_8hpp.html

@@ -34,7 +34,7 @@ MathJax.Hub.Config({
  <tbody>
  <tr id="projectrow">
   <td id="projectalign">
-   <div id="projectname">ZonoOpt<span id="projectnumber">&#160;2.2.0</span>
+   <div id="projectname">ZonoOpt<span id="projectnumber">&#160;2.3.0</span>
    </div>
   </td>
  </tr>