mpifix, figure generation

Alirezalm · Oct 14, 2022 · 8ef31aa · 8ef31aa
1 parent 2474aff
commit 8ef31aa
Show file tree

Hide file tree

Showing 18 changed files with 55 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,8 +9,8 @@ set(CMAKE_CXX_STANDARD 17)
 include_directories(DOSE)
 include_directories(DOSE/include)
 include_directories(ExternLibs/spdlog)
-include_directories(/home/alireza/gurobi952/linux64/include)
-link_directories(/home/alireza/gurobi952/linux64/lib ) #todo : must be changed
+include_directories(/home/goder/gurobi/gurobi952/linux64/include)
+link_directories(/home/goder/gurobi/gurobi952/linux64/lib ) #todo : must be changed
 add_executable(${PROJECT_NAME}
         src/scot.cpp
         DOSE/include/DOSE.h

diff --git a/scotpy/benchmark.py b/scotpy/benchmark.py
@@ -5,6 +5,7 @@
 import os
 from typing import Dict, List
 import numpy as np
+from matplotlib.ticker import MaxNLocator
 from sklearn.datasets import make_classification
 
 from scotpy import AlgorithmType, ProblemType, ScotModel, ScotPy, ScotSettings
@@ -267,7 +268,7 @@ def run(self, solver: Solvers, settings: SolverSettings):
 
             success = self.__run_scot(scot_settings)
             print(
-               Colors.UNDERLINE + Colors.OKBLUE + Colors.BOLD +  f"{solver.name} -> Number of problem solved: {success} / {self.n_problems}" + Colors.ENDC)
+                Colors.UNDERLINE + Colors.OKBLUE + Colors.BOLD + f"{solver.name} -> Number of problem solved: {success} / {self.n_problems}" + Colors.ENDC)
             return success
 
         elif solver == Solvers.SCOTH:
@@ -280,7 +281,7 @@ def run(self, solver: Solvers, settings: SolverSettings):
             )
             success = self.__run_scot(scot_settings)
             print(
-               Colors.UNDERLINE + Colors.OKBLUE + Colors.BOLD +  f"{solver.name} -> Number of problem solved: {success} / {self.n_problems}" + Colors.ENDC)
+                Colors.UNDERLINE + Colors.OKBLUE + Colors.BOLD + f"{solver.name} -> Number of problem solved: {success} / {self.n_problems}" + Colors.ENDC)
             return success
         else:
             success = self.__run_gms_solver(solver = solver, settings = settings)
@@ -459,17 +460,21 @@ def __visualize_results(self, results: Dict[str, List[float]]):
 def plot_results_from_file(filename: str):
     with open(filename, 'r') as reader:
         results = json.load(reader)
-        
+    fs = 10
     markers = ["o", "s", "*", "h", "+", "x", "D"]
-    fig, ax = plt.subplots()
+    colors = ['midnightblue', 'mediumslateblue', 'mediumorchid', 'mediumseagreen', 'slategray', 'olive', 'red']
+    fig, ax = plt.subplots(figsize = (5, 4))
     i = 0
     for key, res in results.items():
         if key != "time":
-            ax.step(results["time"], res, label = key, marker=markers[i])
+            ax.step(results["time"], res, label = key, marker = markers[i], markersize = 4, color = colors[i])
+            # ax.yaxis.set_major_locator(MaxNLocator(integer = True))
+        ax.set_yticks(range(0, 20 + 1, 2))
         i += 1
-    ax.legend()
-    ax.set_xlabel("time (seconds)")
-    ax.set_ylabel("number of problems")
+    plt.legend(bbox_to_anchor = (0, 1.02, 1, 0.2), loc = "lower left",
+               mode = "expand", borderaxespad = 0, ncol = 4, fontsize = fs)
+    ax.set_xlabel("time (seconds)", fontsize = fs)
+    ax.set_ylabel("number of problems", fontsize = fs)
     plt.grid()
     figname = filename.split(".")[0] + ".pdf"
     plt.savefig(f"./figs/{figname}", format = "pdf")

diff --git a/scotpy/example.py b/scotpy/example.py
@@ -0,0 +1,39 @@
+from typing import List
+
+from sklearn.datasets import make_classification
+
+
+from scotpy import (AlgorithmType,
+                    ProblemType,
+                    ScotModel,
+                    ScotPy,
+                    ScotSettings
+                    )
+
+
+def main():
+    total_nodes = 4
+    models: List[ScotModel] = []
+
+    for rank in range(total_nodes):
+        dataset, res = make_classification(
+            n_samples = 500, n_features = 20, n_redundant = 0, n_repeated = 0)
+        scp = ScotModel(problem_name = "logistic_regression", rank = rank,
+                        kappa = 5, ptype = ProblemType.CLASSIFICATION)
+        scp.set_data(dataset, res, normalized_data = True)
+        scp.create()
+        models.append(scp)
+
+    scot_settings = ScotSettings(
+        relative_gap = 1e-4,
+        time_limit = 100,
+        verbose = True,
+        algorithm = AlgorithmType.DIPOA
+    )
+
+    solver = ScotPy(models, scot_settings)
+    solver.run()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scotpy/figs/scenario_1_80.pdf b/scotpy/figs/scenario_1_80.pdf
diff --git a/scotpy/figs/scenario_1_90.pdf b/scotpy/figs/scenario_1_90.pdf
diff --git a/scotpy/figs/scenario_2_80.pdf b/scotpy/figs/scenario_2_80.pdf
diff --git a/scotpy/figs/scenario_2_90.pdf b/scotpy/figs/scenario_2_90.pdf
diff --git a/scotpy/figs/scenario_3_80.pdf b/scotpy/figs/scenario_3_80.pdf
diff --git a/scotpy/figs/scenario_3_90.pdf b/scotpy/figs/scenario_3_90.pdf
diff --git a/scotpy/figs/scenario_4_80.pdf b/scotpy/figs/scenario_4_80.pdf
diff --git a/scotpy/figs/scenario_4_90.pdf b/scotpy/figs/scenario_4_90.pdf
diff --git a/scotpy/figs/scenario_5_80.pdf b/scotpy/figs/scenario_5_80.pdf
diff --git a/scotpy/figs/scenario_5_90.pdf b/scotpy/figs/scenario_5_90.pdf
diff --git a/scotpy/figs/scenario_6_80.pdf b/scotpy/figs/scenario_6_80.pdf
diff --git a/scotpy/figs/scenario_6_90.pdf b/scotpy/figs/scenario_6_90.pdf
diff --git a/scotpy/figs/scenario_7_80.pdf b/scotpy/figs/scenario_7_80.pdf
diff --git a/scotpy/figs/scenario_7_90.pdf b/scotpy/figs/scenario_7_90.pdf
diff --git a/scotpy/scenario_1_90.json b/scotpy/scenario_1_90.json
@@ -168,7 +168,7 @@
         3,
         6,
         8,
-        7,
+        8,
         10,
         12,
         12,