Add compas-rv req to commands

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+* Changed the RhinoCode command requirements to `compas_rv >=0.10.0`.
+
 ### Added
 
 ### Changed

README.md

@@ -1,7 +1,7 @@
 # RhinoVAULT
 
 > [!NOTE]
-> The current version of RhinoVAULT on the Rhino Yak package server is `0.5.34.9081`.
+> The current version of RhinoVAULT can be downloaded through the Rhino Yak package.
 > Note that this is still a pre-release!
 
 ![RhinoVAULT](compas-RV.jpg)

commands/RV.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import pathlib
 

commands/RV_dem_blocks.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 from compas_dem.models import BlockModel

commands/RV_envelope.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_force.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_force_modify.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_force_solve.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_form.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_form_modify.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_loads.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_pattern.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_pattern_boundaries.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 
 import rhinoscriptsyntax as rs  # type: ignore

commands/RV_pattern_modify.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_pattern_relax.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_pattern_supports.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_scene_clear.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 from compas_rv.session import RVSession
 

commands/RV_scene_redraw.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_session_export.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import pathlib
 

commands/RV_session_open.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import pathlib
 

commands/RV_session_redo.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 from compas_rv.session import RVSession
 

commands/RV_session_save.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import pathlib
 

commands/RV_session_undo.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 from compas_rv.session import RVSession
 

commands/RV_settings.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 from pydantic import BaseModel

commands/RV_thrust_info.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 from compas_rui.forms.meshinfo import MeshInfoForm
 from compas_rv.session import RVSession

commands/RV_thrust_modify.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import rhinoscriptsyntax as rs  # type: ignore
 

commands/RV_tna_horizontal.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 
 import rhinoscriptsyntax as rs  # type: ignore  # type: ignore

commands/RV_tna_vertical.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 
 import rhinoscriptsyntax as rs  # type: ignore

commands/RV_tno_analysis.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: brg-csd
-# r: compas_rv>=0.9.5
+# r: compas_rv>=0.10.1
 
 import numpy as np
 import rhinoscriptsyntax as rs  # type: ignore
@@ -11,6 +11,7 @@
 from compas_rv.session import RVSession
 from compas_rv.solvers import update_force_from_form
 from compas_tna.envelope import MeshEnvelope
+from compas_tna.envelope import ParametricEnvelope
 
 OBJECTIVES = [
     "MinimumThrust",
@@ -22,12 +23,13 @@
 ]
 
 
-def get_optimisation_options(objective):
+def get_optimisation_options(objective, envelope):
     constraint_options = [
         ("Funicular", True),
         ("Envelope", objective != "Bestfit"),
-        ("ReactionDirections", False),
     ]
+    if isinstance(envelope, ParametricEnvelope):
+        constraint_options.append(("ReactionDirections", False))
     constraint_options = rs.CheckListBox(constraint_options, "Validate the constraints of the optimisation.", "TNO Constraints")
     if constraint_options is None:
         return
@@ -265,12 +267,7 @@ def RunCommand():
     if not objective:
         return
 
-    solver = rs.GetString("Solver", session.settings.tno.solver, ["SLSQP", "IPOPT"])
-    if not solver:
-        return
-    session.settings.tno.solver = solver
-
-    options = get_optimisation_options(objective)
+    options = get_optimisation_options(objective, envelope)
     if not options:
         return
     constraints, variables = options
@@ -286,6 +283,8 @@ def RunCommand():
     try:
         # Apply the envelope bounds and use the loads prepared on the FormDiagram.
         envelope.apply_bounds_to_formdiagram(formobject.diagram)
+        if "reac_bounds" in constraints:
+            analysis.apply_reaction_bounds()
 
         if abs(sum(formobject.diagram.vertices_attribute("pz"))) < 0.001:
             return session.warn("There are no loads applied to the FormDiagram. Use RV_loads before running TNO analysis.")

requirements.txt

@@ -1,11 +1,11 @@
 compas >=2.13
-compas_cgal >=0.9.1
+compas_cgal >=0.9.2
 compas_dem >=0.3.3
 compas_libigl >=0.7.4
 compas_rui >=0.5.1
 compas_session >=0.5.5
 compas_skeleton
-compas_tna >=0.5
+compas_tna >=0.8.0
 compas_tno >=0.4.0
 compas_triangle >=1.2.1
 tessagon