Removed ortools from license and requirements

SanPen · Oct 10, 2024 · 55f23a3 · 55f23a3
1 parent aec152d
commit 55f23a3
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 29 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/doc/rst_source/license.rst b/doc/rst_source/license.rst
@@ -42,7 +42,7 @@ License of the dependencies
 +--------------+------------------------------------------+
 | pandas       | Apache                                   |
 +--------------+------------------------------------------+
-| ortools      | Apache                                   |
+| pulp         | MIT-like (permissive)                    |
 +--------------+------------------------------------------+
 | xlwt         | BSD                                      |
 +--------------+------------------------------------------+

diff --git a/requirements.txt b/requirements.txt
@@ -4,8 +4,8 @@ networkx>=2.1
 pandas>=1.1
 xlwt>=1.3.0
 xlrd>=1.1.0
-# ortools>=9.10.0,
 pulp
+highspy
 matplotlib>=2.1.1
 qtconsole>=4.3.1
 openpyxl>=2.4.9
@@ -21,8 +21,6 @@ pyproj
 pyarrow>=15
 fastparquet>=2024
 darkdetect
-# pyqtdarktheme
-# qdarktheme
 nptyping
 windpowerlib
 pvlib

diff --git a/src/GridCal/LICENSE.txt b/src/GridCal/LICENSE.txt
@@ -197,7 +197,7 @@ List of strict dependencies
 +--------------+------------------------------------------+
 | pandas       | Apache                                   |
 +--------------+------------------------------------------+
-| ortools      | Apache                                   |
+| pulp         | MIT-like                                 |
 +--------------+------------------------------------------+
 | xlwt         | BSD                                      |
 +--------------+------------------------------------------+

diff --git a/src/GridCal/setup.py b/src/GridCal/setup.py
@@ -84,7 +84,6 @@
                 "scipy>=1.0.0",
                 "networkx>=2.1",
                 "pandas>=1.0",
-                "ortools>=9.8.0",
                 "xlwt>=1.3.0",
                 "xlrd>=1.1.0",
                 "matplotlib>=2.1.1",
@@ -98,7 +97,6 @@
                 "numba>=0.46",  # to compile routines natively
                 'pyproj',
                 'pyarrow',
-                'ortools',
                 "darkdetect",
                 "pyqtdarktheme",
                 "nptyping",

diff --git a/src/GridCalEngine/LICENSE.txt b/src/GridCalEngine/LICENSE.txt
@@ -197,7 +197,7 @@ List of strict dependencies
 +--------------+------------------------------------------+
 | pandas       | Apache                                   |
 +--------------+------------------------------------------+
-| ortools      | Apache                                   |
+| pulp         | MIT-like                                 |
 +--------------+------------------------------------------+
 | xlwt         | BSD                                      |
 +--------------+------------------------------------------+

diff --git a/src/GridCalEngine/Simulations/OPF/linear_opf_ts.py b/src/GridCalEngine/Simulations/OPF/linear_opf_ts.py
@@ -680,7 +680,7 @@ def add_linear_generation_formulation(t: Union[int, None],
     :param time_array: complete time array
     :param gen_data_t: GeneratorData structure
     :param gen_vars: GenerationVars structure
-    :param prob: ORTools problem
+    :param prob: LpModel
     :param unit_commitment: formulate unit commitment?
     :param ramp_constraints: formulate ramp constraints?
     :param skip_generation_limits: skip the generation limits?

diff --git a/src/GridCalEngine/Utils/MIP/pulp_interface.py b/src/GridCalEngine/Utils/MIP/pulp_interface.py
@@ -16,7 +16,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 """
-This module abstracts the synthax of ORTOOLS out
+This module abstracts the synthax of PuLP out
 so that in the future it can be exchanged with some
 other solver interface easily
 """
@@ -86,7 +86,7 @@ def set_var_bounds(var: LpVar, lb: float, ub: float):
 
 class LpModel:
     """
-    LPModel implementation for ORTOOLS
+    LPModel implementation for PuLP
     """
     OPTIMAL = pulp.LpStatusOptimal
     INFINITY = 1e20

diff --git a/src/GridCalEngine/setup.py b/src/GridCalEngine/setup.py
@@ -56,7 +56,9 @@
                 "scipy>=1.0.0",
                 "networkx>=2.1",
                 "pandas>=1.0",
-                "ortools>=9.10.0",
+                # "ortools>=9.10.0",
+                "pulp",
+                "highspy",
                 "xlwt>=1.3.0",
                 "xlrd>=1.1.0",
                 "matplotlib>=2.1.1",
@@ -70,8 +72,6 @@
                 "numba>=0.46",  # to compile routines natively
                 'pyproj',
                 'pyarrow>=15',
-                # 'ortools',
-                'pulp',
                 "nptyping",
                 "windpowerlib",
                 "pvlib",

diff --git a/src/GridCalServer/LICENSE.txt b/src/GridCalServer/LICENSE.txt
@@ -197,7 +197,7 @@ List of strict dependencies
 +--------------+------------------------------------------+
 | pandas       | Apache                                   |
 +--------------+------------------------------------------+
-| ortools      | Apache                                   |
+| pulp         | MIT-Like                                 |
 +--------------+------------------------------------------+
 | xlwt         | BSD                                      |
 +--------------+------------------------------------------+