update optimiser options and starting points

ricardoavelino · ricardoavelino · commit 2ffc900db2ed · 2025-09-03T00:18:01.000+02:00
diff --git a/src/compas_tno/analysis/__init__.py b/src/compas_tno/analysis/__init__.py
@@ -1,9 +1,5 @@
 from .analysis import Analysis
-from .routines import limit_analysis_GSF, thk_minmax_GSF, max_n_minmax_GSF
 
 __all__ = [
     "Analysis",
-    "limit_analysis_GSF",
-    "thk_minmax_GSF",
-    "max_n_minmax_GSF",
 ]
diff --git a/src/compas_tno/optimisers/optimiser.py b/src/compas_tno/optimisers/optimiser.py
@@ -36,13 +36,13 @@ class Optimiser(Data):
     --------
     The main settings and default values are shown below:
 
-    *  'library'           : ['Scipy', 'MATLAB', 'MMA', 'IPOPT', 'Scipy', ...]
-    *  'solver'            : ['SLSQP', 'IPOPT', 'MMA', ...],
+    *  'solver'            : ['SLSQP', 'IPOPT', ...],
     *  'objective'         : ['min', 'max', 't', 'loadpath', 'bestfit', ...],
     *  'constraints'       : ['funicular', 'envelope', 'reac_bounds', ...],
     *  'variables'         : ['q', 'zb', 'xyb', 't', ...],
     *  'features'          : ['fixed', 'sym', ...],
     *  'find_inds'         : True,
+    *  'solver_convex'     : ['CLARABEL', 'MOSEK', 'CVXPY', ...],
     *  'exitflag'          : 1,
     *  'printout'          : True,
     *  'starting_point'    : 'current',
@@ -80,7 +80,7 @@ def __init__(self, **kwargs):
             "printout": False,
             "plot": False,
             "starting_point": "current",
-            "solver_convex": "CVXPY",
+            "solver_convex": "CLARABEL",
             "support_displacement": None,
             "gradient": True,
             "jacobian": True,
@@ -269,7 +269,7 @@ def create_maxthrust_optimiser(
     @classmethod
     def create_max_horload_optimiser(
         cls,
-        solver: str = "IPOPT",
+        solver: str = "SLSQP",
         max_iter: int = 500,
         printout: bool = False,
         plot: bool = False,
@@ -364,7 +364,7 @@ def create_bestfit_optimiser(
     @classmethod
     def create_max_vertload_optimiser(
         cls,
-        solver: str = "IPOPT",
+        solver: str = "SLSQP",
         max_iter: int = 500,
         printout: bool = False,
         plot: bool = False,
@@ -416,7 +416,7 @@ def create_max_vertload_optimiser(
     @classmethod
     def create_lp_optimiser(
         cls,
-        solver: str = "MATLAB",
+        solver: str = "CLARABEL",
         printout: bool = False,
         plot: bool = False,
         max_iter: int = 500,
@@ -444,11 +444,11 @@ def create_lp_optimiser(
         Raises
         ------
         ValueError
-            If solver is not one of: "MATLAB", "CVXPY".
+            If solver is not one of: "CLARABEL", "MOSEK", "CVXPY".
 
         """
-        if solver not in ["MATLAB", "CVXPY"]:
-            raise ValueError("For loadpath optimisation only MATLAB or CVXPY are possible solvers. See solvers page.")
+        if solver not in ["CLARABEL", "MOSEK", "CVXPY"]:
+            raise ValueError("For loadpath optimisation only CLARABEL, MOSEK, CVXPY are possible solvers. See solvers page.")
 
         optimiser = cls()
         optimiser.set_solver(solver)
diff --git a/src/compas_tno/problems/__init__.py b/src/compas_tno/problems/__init__.py
@@ -47,7 +47,7 @@
 
 from .callbacks import callback_save_json, callback_create_json, save_geometry_at_iterations
 
-from .startingpoint import startingpoint_loadpath, startingpoint_tna, startingpoint_fdm
+from .startingpoint import startingpoint_loadpath, startingpoint_tna, startingpoint_fdm, startingpoint_sag
 
 from .setup import (
     set_up_general_optimisation,
@@ -101,6 +101,7 @@
     "startingpoint_loadpath",
     "startingpoint_tna",
     "startingpoint_fdm",
+    "startingpoint_sag",
     "set_up_general_optimisation",
     "set_up_convex_optimisation",
     "startingpoint_loadpath_proxy",
diff --git a/src/compas_tno/problems/callbacks.py b/src/compas_tno/problems/callbacks.py
@@ -3,9 +3,10 @@
 from numpy import array
 
 import compas_tno
-from compas_tno.algorithms import reciprocal_from_form
+from compas_tna.diagrams import FormDiagram
+
+# from compas_tno.algorithms import reciprocal_from_form
 from compas_tno.algorithms import xyz_from_xopt
-from compas_tno.diagrams import FormDiagram
 from compas_tno.optimisers import Optimiser
 
 
@@ -92,7 +93,8 @@ def save_geometry_at_iterations(form: FormDiagram, optimiser: Optimiser, force=F
                 form.edge_attribute(edge, "q", problem.q.flatten()[k])
                 k += 1
 
-            force = reciprocal_from_form(form)
+            raise NotImplementedError("Force diagram not implemented for TNO yet")
+            # force = reciprocal_from_form(form)
             Xforce_i = force.vertices_attributes("xyz")
             Xforce[str(i)] = Xforce_i
 
diff --git a/src/compas_tno/problems/problems.py b/src/compas_tno/problems/problems.py
@@ -13,6 +13,14 @@
     from compas_tno.shapes import Shape
 
 # from numpy import asarray
+from dataclasses import dataclass
+from dataclasses import field
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+
+import numpy.typing as npt
 from numpy import array
 from numpy import hstack
 from numpy import identity
@@ -26,15 +34,14 @@
 from scipy.sparse import vstack as svstack
 
 from compas.geometry import Point
-from compas.geometry import distance_point_point_xy
 from compas.matrices import connectivity_matrix
+from compas_tna.diagrams import FormDiagram
 from compas_tna.envelope import Envelope
 
 # from compas_tno.algorithms import check_independents
 # from compas.utilities import reverse_geometric_key
 from compas_tno.algorithms import check_horizontal_loads
 from compas_tno.algorithms import find_independents
-from compas_tno.diagrams import FormDiagram
 from compas_tno.utilities import apply_radial_symmetry
 from compas_tno.utilities import apply_symmetry_from_axis
 from compas_tno.utilities import build_symmetry_transformation
@@ -45,16 +52,6 @@ def reverse_geometric_key(gkey):
     raise NotImplementedError
 
 
-from dataclasses import dataclass
-from dataclasses import field
-from typing import Any
-from typing import Dict
-from typing import List
-from typing import Optional
-
-import numpy.typing as npt
-
-
 @dataclass
 class Problem:
     """
diff --git a/src/compas_tno/problems/setup.py b/src/compas_tno/problems/setup.py
@@ -7,7 +7,6 @@
 from numpy import vstack
 from numpy import zeros
 
-from compas_tno.algorithms import apply_sag
 from compas_tno.algorithms import equilibrium_fdm
 from compas_tno.algorithms import q_from_variables
 from compas_tno.algorithms import xyz_from_q
@@ -21,6 +20,7 @@
 from compas_tno.problems import objective_selector
 from compas_tno.problems import sensitivities_wrapper
 from compas_tno.problems import startingpoint_loadpath
+from compas_tno.problems import startingpoint_sag
 from compas_tno.problems import startingpoint_tna
 from compas_tno.utilities import compute_edge_stiffness
 from compas_tno.utilities import compute_form_initial_lengths
@@ -66,7 +66,7 @@ def set_up_general_optimisation(analysis: "Analysis"):
     qmax = optimiser.settings.get("qmax", +1e-8)
     features = optimiser.settings.get("features", [])
     save_iterations = optimiser.settings.get("save_iterations", False)
-    solver_convex = optimiser.settings.get("solver_convex", "MATLAB")
+    solver_convex = optimiser.settings.get("solver_convex", "CLARABEL")
     autodiff = optimiser.settings.get("autodiff", False)
 
     pattern_center = form.centroid()
@@ -115,8 +115,8 @@ def set_up_general_optimisation(analysis: "Analysis"):
         pass
 
     elif starting_point == "sag":
-        apply_sag(form, boundary_force=50.0)  # the issue here is that after the sag the problem.x0, problem.y0 are not updated
-        startingpoint_tna(form)
+        boundary_force = 50.0
+        startingpoint_sag(form, boundary_force=boundary_force)
 
     elif starting_point == "loadpath":
         printout_loadpath = False  # this need to be a proper verbose level
@@ -447,7 +447,15 @@ def set_up_convex_optimisation(analysis: "Analysis"):
     else:
         print("Warning: Non-convex problem for the constraints: ", constraints, ". Considering only 'funicular' instead.")
 
-    form.apply_bounds_on_q(qmin=qmin, qmax=qmax)
+    # Apply bounds on the edges' force densities (apply_bounds_on_q)
+    if isinstance(qmin, list):
+        for i, edge in enumerate(form.edges_where({"_is_edge": True})):
+            form.edge_attribute(edge, "qmin", qmin[i])
+            form.edge_attribute(edge, "qmax", qmax[i])
+    else:
+        for i, edge in enumerate(form.edges_where({"_is_edge": True})):
+            form.edge_attribute(edge, "qmin", qmin)
+            form.edge_attribute(edge, "qmax", qmax)
 
     problem = initialise_problem_general(form)
     problem.variables = variables
diff --git a/src/compas_tno/problems/startingpoint.py b/src/compas_tno/problems/startingpoint.py
@@ -2,14 +2,29 @@
 
 from compas_tno.algorithms import compute_reactions
 from compas_tno.algorithms import equilibrium_fdm
-from compas_tno.algorithms import form_update_with_parallelisation
-from compas_tno.solvers.solver_cvxpy import run_loadpath_from_form_CVXPY
-from compas_tno.solvers.solver_MATLAB import run_loadpath_from_form_MATLAB
+from compas_tno.solvers import run_loadpath_from_form_CVXPY
 
 
-def startingpoint_loadpath(form, problem=None, find_inds=False, solver_convex="CVXPY", printout=False):
+def startingpoint_sag(form, boundary_force=50.0, **kwargs):
+    """Initialize the equilibrium in a form diagram with applied loads using sag approach
+
+    Parameters
+    ----------
+    form : :class:`~compas_tno.diagrams.FormDiagram`
+        The form diagram. Loads and support must already have been assigned
+    boundary_force : float, optional
+        Force density in the edges on the boundary.
+        The default value is ``50.0``.
+    """
+    form.edges_attribute("q", min(boundary_force, -1 * boundary_force), list(form.edges_on_boundary()))
+    startingpoint_fdm(form)
+    for key in form.vertices():
+        form.vertex_attribute(key, "z", 0.0)
+    return form
+
+
+def startingpoint_loadpath(form, problem=None, find_inds=False, solver_convex="CLARABEL", printout=False, **kwargs):
     """Built-in function to optimise the loadpath considering diagram fixed projection.
-    Note: This function will select the most appropriate solver (CVX or MOSEK)
 
     Parameters
     ----------
@@ -20,7 +35,8 @@ def startingpoint_loadpath(form, problem=None, find_inds=False, solver_convex="C
     find_inds : bool, optional
         If independents need to be found before the loadpath computation, by default False
     solver_convex : str, optional
-        Solver to compute the convex optimisation, by default CVXPY
+        Solver to use, by default CLARABEL. Options are "CLARABEL", "MOSEK" or "CVXOPT".
+        Note: "MOSEK" and "CVXOPT" are not available in the default installation of TNO.
     printout : bool, optional
         If prints about the optimisation data should appear in the screen, by default False
 
@@ -30,22 +46,18 @@ def startingpoint_loadpath(form, problem=None, find_inds=False, solver_convex="C
         The class with the main matrices of the problem
     """
 
-    if solver_convex == "CVX" or solver_convex == "MATLAB":
-        if not importlib.util.find_spec("matlab"):
-            raise ValueError("MATLAB/CVX not configured. Try changing the <solver_convex> attribute.")
-        problem = run_loadpath_from_form_MATLAB(form, problem=problem, find_inds=find_inds, printout=printout)
-    elif solver_convex == "CVXPY" or solver_convex == "MOSEK":
-        if not importlib.util.find_spec("cvxpy"):
-            raise ValueError("CVXPY/MOSEK not configured. Try changing the <solver_convex> attribute.")
-        problem = run_loadpath_from_form_CVXPY(form, problem=problem, find_inds=find_inds, printout=printout)
-    else:
-        raise ValueError("Could not initilalise loadpath optimisation with {}. Try changing the <solver_convex> attribute.".format(solver_convex))
+    problem = run_loadpath_from_form_CVXPY(
+        form,
+        problem=problem,
+        find_inds=find_inds,
+        solver_convex=solver_convex,
+        printout=printout,
+    )
 
     return problem
 
 
-# Use the appropiate functions at TNA here
-def startingpoint_tna(form, plot=False):
+def startingpoint_tna(form, plot=False, **kwargs):
     """Initialize the equilibrium in a form diagram with applied loads using TNA interative solver procedure (form and force diagrams are parallel)
 
     Parameters
@@ -56,13 +68,15 @@ def startingpoint_tna(form, plot=False):
         Plots of the intermediare and final force diagrams to follow the process, by default False
     """
 
-    form_update_with_parallelisation(form, plot=plot)
+    # form_update_with_parallelisation(form, plot=plot)
 
-    compute_reactions(form)
+    # compute_reactions(form)
+
+    raise NotImplementedError("Starting point not implemented for TNA")
 
 
 # Use the appropiate functions at TNA here
-def startingpoint_fdm(form):
+def startingpoint_fdm(form, **kwargs):
     """Initialize the equilibrium in a form diagram with applied loads using FDM approach for the q's stored in the form
 
     Parameters

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`	`1`	`from .analysis import Analysis`
`2`		`-from .routines import limit_analysis_GSF, thk_minmax_GSF, max_n_minmax_GSF`
`3`	`2`
`4`	`3`	`__all__ = [`
`5`	`4`	`"Analysis",`
`6`		`- "limit_analysis_GSF",`
`7`		`- "thk_minmax_GSF",`
`8`		`- "max_n_minmax_GSF",`
`9`	`5`	`]`