separate K1x and Cholesky from pdcoO

optimizers · Mar 12, 2018 · 4897b95 · 4897b95
1 parent 04eb561
commit 4897b95
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Formulations/K1x.m b/Formulations/K1x.m
@@ -1,5 +1,5 @@
-classdef K1x < pdcoO
-    
+classdef K1x < handle
+
     properties
         M
         rhs
@@ -13,7 +13,6 @@
 
     methods
         function o = K1x(slack, options)
-            o = o@pdcoO(slack, options);
             o.diagHess = true;
         end
 

diff --git a/Solvers/Cholesky.m b/Solvers/Cholesky.m
@@ -1,13 +1,12 @@
-classdef Cholesky < pdcoO
-    
+classdef Cholesky < handle
+
     properties
         R
         P
     end
 
     methods
         function o = Cholesky(slack, options)
-            o = o@pdcoO(slack, options);
             o.manage_op = false;
             o.need_precon = false;
             o.solver = '  Chol';  o.head3 = '     Chol';

diff --git a/format_template.m b/format_template.m
@@ -1,10 +1,11 @@
 function newclass = format_template(formulation, solver)
 
-  template = ['classdef pdco_%s_%s < %s & %s\n'             ...
+  template = ['classdef pdco_%s_%s < pdcoO & %s & %s\n'     ...
               '  properties\n'                              ...
               '  end\n\n'                                   ...
               '  methods\n'                                 ...
               '  function o = pdco_%s_%s(slack, options)\n' ...
+              '    o = o@pdcoO(slack, options);\n'          ...
               '    o = o@%s(slack, options);\n'             ...
               '    o = o@%s(slack, options);\n'             ...
               '  end\n'                                     ...