linter and changelog

Author: ricardoavelino

CHANGELOG.md

@@ -9,10 +9,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Separated routines for `starting_point`.
+
 ### Changed
 
+* Updated `Analysis` object and optimization routines to work with the new infrastructure.
+
 ### Removed
 
+* Removed modules `.diagrams`, `.shape`. TNO is meant to operate with `compas_tna` classes. 
+* Removed module`.viewer`. New viewer is in `compas_masonnry`.
+* Removed `MATLAB` convex optimization to simplify installation
+* Removed unused solvers such as `MMA` and `PyOpt`. New focus is on `slsqp` and `ipopt`.
+* Made `ipopt` optional to simplify base installation.
 
 ## [0.2.2] 2023-09-03
 

src/compas_tno/problems/constraints.py

@@ -48,7 +48,6 @@ def constr_wrapper(variables: npt.NDArray, M: "Problem") -> npt.NDArray:
     lambdh = 1.0
     delta = 0.0
     thk: float = M.thk  # type: ignore
-    min_lb: float = M.min_lb  # type: ignore
 
     if "xyb" in M.variables:
         xyb = variables[check : check + 2 * nb]

src/compas_tno/problems/problems.py

@@ -306,7 +306,7 @@ def initialise_problem_general(form: FormDiagram) -> Problem:
         z[i] = vertex.get("z")
         px[i] = vertex.get("px", 0)
         py[i] = vertex.get("py", 0)
-        pz[i] = vertex.get("pz", 0) # + pz_fill + pz_ext
+        pz[i] = vertex.get("pz", 0)  # + pz_fill + pz_ext
         s[i] = vertex.get("target", 0)  # used for bestfit
         if abs(s[i]) < 1e-6:
             s[i] = 0.0
@@ -448,8 +448,6 @@ def adapt_problem_to_fixed_diagram(
 
     """
     ind = []
-    tol_old_ind = 1e-3
-
     start_time = time.time()
 
     # Independent and dependent branches

src/compas_tno/problems/setup.py

@@ -53,7 +53,6 @@ def set_up_general_optimisation(analysis: "Analysis"):
     optimiser = analysis.optimiser
 
     printout = optimiser.settings.get("printout", True)
-    plot = optimiser.settings.get("plot", False)
     axis_symmetry = optimiser.settings.get("axis_sym", None)
     sym_loads = optimiser.settings.get("sym_loads", False)
     fjac = optimiser.settings.get("jacobian", False)

src/compas_tno/solvers/cvxpy.py

@@ -50,7 +50,7 @@ def run_loadpath_from_form_CVXPY(form, problem=None, find_inds=False, solver_con
     find_inds : bool, optional
         Whether or not independents must be computed before the analysis, by default False
     solver_convex : str, optional
-        Solver to use, by default CLARABEL. Options are "CLARABEL", "MOSEK" or "CVXOPT". 
+        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
         Whether or not print results, by default False
@@ -82,7 +82,7 @@ def call_and_output_CVXPY(form, problem, solver_convex="CLARABEL", printout=Fals
     problem : ::class:: Problem
         The Problem with relevant matrices and vectors
     solver_convex : str, optional
-        Solver to use, by default CLARABEL. Options are "CLARABEL", "MOSEK" or "CVXOPT". 
+        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
         Whether or not print results, by default False
@@ -156,7 +156,7 @@ def call_cvxpy(problem, solver_convex="CLARABEL", printout=False):
     problem : ::class:: Problem
         The Problem with relevant matrices and vectors`
     solver_convex : str, optional
-        Solver to use, by default CLARABEL. Options are "CLARABEL", "MOSEK" or "CVXOPT". 
+        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
         Whether or not print results, by default False
@@ -230,7 +230,7 @@ def call_cvxpy_ind(problem, solver_convex="CLARABEL", printout=False):
     problem : ::class:: Problem
         The Problem with relevant matrices and vectors
     solver_convex : str, optional
-        Solver to use, by default CLARABEL. Options are "CLARABEL", "MOSEK" or "CVXOPT". 
+        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
         Whether or not print results, by default False

src/compas_tno/solvers/ipopt.py

@@ -114,12 +114,7 @@ def run_nlopt_ipopt(analysis: "Analysis"):
         raise ImportError("IPOPT is not installed. Please install it using `pip install cyipopt`")
 
     optimiser = analysis.optimiser
-
-    constraints = optimiser.settings["constraints"]
-    objective = optimiser.settings["objective"]
     printout = optimiser.settings.get("printout", False)
-    gradients = optimiser.settings.get("gradient", False)
-    variables = optimiser.settings["variables"]
     callback = optimiser.callback
 
     bounds = optimiser.bounds

src/compas_tno/solvers/post_process.py

@@ -2,12 +2,10 @@
 
 if TYPE_CHECKING:
     from compas_tna.diagrams import FormDiagram
-    from compas_tna.envelope import Envelope
     from compas_tno.analysis import Analysis
     from compas_tno.optimisers import Optimiser
     from compas_tno.problems import Problem
 
-from compas_tna.envelope import Envelope
 from compas_tno.algorithms import compute_reactions
 from compas_tno.algorithms import q_from_variables
 from compas_tno.algorithms import xyz_from_q
@@ -30,14 +28,13 @@ def post_process_general(analysis: "Analysis"):
 
     form: "FormDiagram" = analysis.formdiagram
     optimiser: "Optimiser" = analysis.optimiser
-    envelope: "Envelope" = analysis.envelope
-    # shape: "Shape" = analysis.shape
+    # envelope: "Envelope" = analysis.envelope
 
     problem: "Problem" = optimiser.problem
     summary = optimiser.settings.get("summary", False)
     printout = optimiser.settings.get("printout", True)
-    thickness_type = optimiser.settings.get("thickness_type", "constant")
-    features = optimiser.settings.get("features", [])
+    # thickness_type = optimiser.settings.get("thickness_type", "constant")
+    # features = optimiser.settings.get("features", [])
     save_iterations = optimiser.settings.get("save_iterations", False)
     show_force_diagram = optimiser.settings.get("save_force_diagram", True)
 
@@ -177,9 +174,10 @@ def post_process_general(analysis: "Analysis"):
     if "n" in problem.variables:
         print("Value of N:", n)
         n = -1 * fopt
-        shape.intrados = shape.intrados.offset_mesh(n=n, direction="up")
-        shape.extrados = shape.extrados.offset_mesh(n=n, direction="down")
-        form.apply_envelope_from_shape(shape)
+        pass
+        # shape.intrados = shape.intrados.offset_mesh(n=n, direction="up")
+        # shape.extrados = shape.extrados.offset_mesh(n=n, direction="down")
+        # form.apply_envelope_from_shape(shape)
 
     if "tub" in problem.variables:
         for i, key in enumerate(form.vertices()):

src/compas_tno/solvers/scipy.py

@@ -9,8 +9,6 @@
 import numpy as np
 from scipy.optimize import fmin_slsqp
 
-from .post_process import post_process_general
-
 if TYPE_CHECKING:
     from compas_tno.analysis import Analysis
     from compas_tno.optimisers import Optimiser

src/compas_tno/utilities/__init__.py

@@ -1,14 +1,43 @@
-from .constraints import (assign_cracks, check_envelope_constraints, distance_target, rectangular_smoothing_constraints, rollers_on_openings, set_b_constraint,
-                          set_rollers_constraint)
-from .form import (displacement_map_4parabolas, displacement_map_parabola, displacement_map_paraboloid, fix_mesh_boundary, fix_mesh_corners, form_add_lines_support,
-                   form_parabolic_slide, mesh_remove_two_valent_nodes, move_pattern_inwards, move_pattern_outwards, move_pattern_to_origin, shuffle_diagram, slide_diagram,
-                   slide_pattern_inwards, split_intersection_lines, store_inds)
+from .constraints import (
+    assign_cracks,
+    check_envelope_constraints,
+    distance_target,
+    rectangular_smoothing_constraints,
+    rollers_on_openings,
+    set_b_constraint,
+    set_rollers_constraint,
+)
+from .form import (
+    displacement_map_4parabolas,
+    displacement_map_parabola,
+    displacement_map_paraboloid,
+    fix_mesh_boundary,
+    fix_mesh_corners,
+    form_add_lines_support,
+    form_parabolic_slide,
+    mesh_remove_two_valent_nodes,
+    move_pattern_inwards,
+    move_pattern_outwards,
+    move_pattern_to_origin,
+    shuffle_diagram,
+    slide_diagram,
+    slide_pattern_inwards,
+    split_intersection_lines,
+    store_inds,
+)
 from .functions import dome, paraboloid
 from .interpolation import create_mesh_from_topology_and_basemesh, create_mesh_from_topology_and_pointcloud, interpolate_from_pointcloud, mesh_from_pointcloud
 from .json import update_json
 from .stiffness import compute_average_edge_stiffness, compute_edge_stiffness, compute_form_initial_lengths
-from .symmetry import (apply_radial_symmetry, apply_symmetry_from_axis, build_symmetry_matrix, build_symmetry_matrix_supports, build_symmetry_transformation,
-                       build_vertex_symmetry_transformation, find_sym_axis_in_rect_patterns)
+from .symmetry import (
+    apply_radial_symmetry,
+    apply_symmetry_from_axis,
+    build_symmetry_matrix,
+    build_symmetry_matrix_supports,
+    build_symmetry_transformation,
+    build_vertex_symmetry_transformation,
+    find_sym_axis_in_rect_patterns,
+)
 
 __all__ = [
     "apply_radial_symmetry",