new file organization

optimizers · Mar 12, 2018 · fbbed61 · fbbed61
1 parent a1e1ab2
commit fbbed61
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -2,3 +2,9 @@
 
 An experimental object-oriented version of
 [PDCO](http://web.stanford.edu/group/SOL/software/pdco).
+
+## List of dependencies
+
+* Model module (available at https://github.com/optimizers/model ),
+* Ampl to nlpmodel interface (available at https://github.com/optimizers/AmplMexInterface ),
+* Spot module (available at https://github.com/optimizers/spot ),
diff --git a/afiro.mps → Test/afiro.mps b/afiro.mps → Test/afiro.mps
diff --git a/pdco_ampl.m → Test/pdco_ampl.m b/pdco_ampl.m → Test/pdco_ampl.m
diff --git a/script_problem.m → Test/script_problem.m b/script_problem.m → Test/script_problem.m
diff --git a/script_test.m → Test/script_test.m b/script_test.m → Test/script_test.m
diff --git a/mpstolp.m → Tools/mpstolp.m b/mpstolp.m → Tools/mpstolp.m
diff --git a/qpstoqp.m → Tools/qpstoqp.m b/qpstoqp.m → Tools/qpstoqp.m
diff --git a/pdco_K1x_Cholesky.m → Variants/pdco_K1x_Cholesky.m b/pdco_K1x_Cholesky.m → Variants/pdco_K1x_Cholesky.m
diff --git a/build_variant.m b/build_variant.m
@@ -1,7 +1,7 @@
 function classname = build_variant(formulation, solver)
 
   classname = sprintf('pdco_%s_%s', formulation, solver);
-  fname = [classname, '.m'];
+  fname = ['Variants/' , classname, '.m'];
   fid = fopen(fname, 'w');
   code = format_template(formulation, solver);
   fprintf(fid, code);

diff --git a/setup.m b/setup.m
@@ -2,3 +2,5 @@
 addpath(fullfile(pwd, 'Solvers'))
 addpath(pwd)
 addpath(fullfile(pwd, 'readmps'))
+addpath(fullfile(pwd, 'Variants'))
+addpath(fullfile(pwd, 'Tools'))