|
52 | 52 | from Optimizer.trust_radius import TrustRadius |
53 | 53 | from Optimizer.gradientdescent import GradientDescent, MassWeightedGradientDescent |
54 | 54 | from Optimizer.gpmin import GPmin |
| 55 | +from Optimizer.cubic_newton import CubicNewton |
55 | 56 |
|
56 | 57 | optimizer_mapping = { |
57 | 58 | "adabelief": Adabelief, |
|
92 | 93 | } |
93 | 94 |
|
94 | 95 | quasi_newton_mapping = { |
| 96 | + "cubicnewton_bfgs": {"delta": 0.50}, |
| 97 | + "cubicnewton_fsb": {"delta": 0.50}, |
| 98 | + "cubicnewton_bofill": {"delta": 0.50}, |
| 99 | + "cubicnewton_msp": {"delta": 0.50}, |
| 100 | + "cubicnewton_sr1": {"delta": 0.50}, |
| 101 | + "cubicnewton_psb": {"delta": 0.50}, |
| 102 | + "cubicnewton_flowchart": {"delta": 0.50}, |
| 103 | + |
| 104 | + |
95 | 105 | "rsirfo_bfgs": {"delta": 0.50, "rfo_type": 1}, |
96 | 106 | "rsirfo_fsb": {"delta": 0.50, "rfo_type": 1}, |
97 | 107 | "rsirfo_bofill": {"delta": 0.50, "rfo_type": 1}, |
@@ -300,6 +310,9 @@ def initialization(self, method): |
300 | 310 | print(key) |
301 | 311 | if "ersprfo" in key: |
302 | 312 | optimizer_instances.append(EnhancedRSPRFO(method=m, saddle_order=self.saddle_order, element_list=self.element_list)) |
| 313 | + elif "cubicnewton" in key: |
| 314 | + optimizer_instances.append(CubicNewton(method=m, saddle_order=self.saddle_order, element_list=self.element_list)) |
| 315 | + |
303 | 316 | elif "rsprfo" in key: |
304 | 317 | optimizer_instances.append(RSPRFO(method=m, saddle_order=self.saddle_order, element_list=self.element_list)) |
305 | 318 |
|
|
0 commit comments