clean utilities and remove mosek dependency

Author: ricardoavelino

environment.yml

@@ -1,14 +1,12 @@
 name: tno-dev
 channels:
   - conda-forge
-  - mosek
 dependencies:
   - python >=3.9
   - pip >=19.0
   - compas >=2.13
   - compas_occ >=1.3
   - cvxpy
   - cyipopt
-  - mosek
   - pip:
       - -e .

src/compas_tno/problems/constraints.py

@@ -15,7 +15,6 @@
 from compas_tno.algorithms import weights_from_xyz
 from compas_tno.algorithms import xyz_from_q
 from compas_tno.problems.bounds_update import b_update
-from compas_tno.problems.bounds_update import ub_lb_update
 
 
 def constr_wrapper(variables: npt.NDArray, M: "Problem") -> npt.NDArray:

src/compas_tno/problems/setup.py

@@ -202,7 +202,9 @@ def set_up_general_optimisation(analysis: "Analysis"):
     # =============================================================================
 
     if "reac_bounds" in constraints:
-        problem.b = set_b_constraint(form, printout)
+        # double check if reac_bounds have been applied
+        fixed = form.vertices_where({"is_support": True})
+        problem.b = array(form.vertices_attribute("b", keys=fixed))
     else:
         problem.b = None
 

src/compas_tno/problems/startingpoint.py

@@ -1,5 +1,3 @@
-import importlib.util
-
 from compas_tno.algorithms import compute_reactions
 from compas_tno.algorithms import equilibrium_fdm
 from compas_tno.solvers import run_loadpath_from_form_CVXPY

src/compas_tno/utilities/__init__.py

@@ -1,74 +1,14 @@
-from .symmetry import (
-    apply_radial_symmetry,
-    apply_symmetry_from_axis,
-    find_sym_axis_in_rect_patterns,
-    build_symmetry_matrix,
-    build_symmetry_transformation,
-    build_vertex_symmetry_transformation,
-    build_symmetry_matrix_supports,
-)
-
-from .constraints import (
-    check_envelope_constraints,
-    distance_target,
-    rectangular_smoothing_constraints,
-    assign_cracks,
-    rollers_on_openings,
-    set_b_constraint,
-    set_rollers_constraint,
-)
-
-from .functions import paraboloid, dome
-
-from .interpolation import (
-    interpolate_from_pointcloud,
-    mesh_from_pointcloud,
-    create_mesh_from_topology_and_pointcloud,
-    create_mesh_from_topology_and_basemesh,
-)
-
-from .stiffness import (
-    compute_form_initial_lengths,
-    compute_edge_stiffness,
-    compute_average_edge_stiffness,
-)
-
+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 .blocks import blocks_from_dual, extended_dual
-
-from .form import (
-    split_intersection_lines,
-    form_add_lines_support,
-    form_parabolic_slide,
-    move_pattern_to_origin,
-    fix_mesh_corners,
-    fix_mesh_boundary,
-    slide_diagram,
-    mesh_remove_two_valent_nodes,
-    store_inds,
-    slide_pattern_inwards,
-    displacement_map_paraboloid,
-    displacement_map_4parabolas,
-    displacement_map_parabola,
-    move_pattern_inwards,
-    move_pattern_outwards,
-    shuffle_diagram,
-)
-
-from .data_analysis import (
-    diagram_of_thrust,
-    diagram_of_multiple_thrust,
-    diagram_of_thrust_load_mult,
-    surface_GSF_load_mult,
-    save_csv_row,
-    open_csv_row,
-    interpolate_min_thk,
-    filter_min_thk,
-    lookup_folder,
-    save_pointcloud,
-)
-
+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)
 
 __all__ = [
     "apply_radial_symmetry",