add function for converting qcp to socp

Argonne-National-Laboratory · Dec 18, 2020 · e37ee6a · e37ee6a
1 parent 2cb3124
commit e37ee6a
Show file tree

Hide file tree

Showing 9 changed files with 956 additions and 59 deletions.
diff --git a/examples/quad/farmer4.cor b/examples/quad/farmer4.cor
@@ -6,14 +6,14 @@ ROWS
 COLUMNS
 RHS
    RHS      QC0      1600
-   RHS      QC1      3600
+   RHS      QC1      6400
    RHS      QC2      1600
 QCMATRIX   QC0
-   x1 x1 1
-   x5 x5 2
-QCMATRIX   QC1
    x1 x1 2
    x2 x2 1
+QCMATRIX   QC1
+   x1 x1 1
+   x5 x5 2
 QCMATRIX   QC2
    x5 x5 1
 ENDATA
diff --git a/examples/quad/farmer4.tim b/examples/quad/farmer4.tim
@@ -2,5 +2,5 @@
 TIME          FARMER
 PERIODS       IMPLICIT
     QC0                      PERIOD1
-    QC2                      PERIOD2	
+    QC1                      PERIOD2	
 ENDATA
diff --git a/src/DspCInterface.cpp b/src/DspCInterface.cpp
@@ -136,9 +136,9 @@ int readDro(DspApiEnv * env, const char * dro)
 }
 
 /** read quad files */
-int readQuad(DspApiEnv * env, const char * smps, const char * quad)
+int readQuad(DspApiEnv * env, const char * smps, const char * quad, bool chg_to_socp)
 {
-	return getTssModel(env)->readQuad(smps, quad);
+	return getTssModel(env)->readQuad(smps, quad, chg_to_socp);
 }
 
 /** load first-stage problem */

diff --git a/src/DspCInterface.h b/src/DspCInterface.h
@@ -62,7 +62,7 @@ int readSmps(DspApiEnv * env, const char * smps);
 int readDro(DspApiEnv * env, const char * dro);
 
 /** read quad files */
-int readQuad(DspApiEnv * env, const char * smps, const char * quad);
+int readQuad(DspApiEnv * env, const char * smps, const char * quad, bool chg_to_socp = true);
 
 /** load first-stage problem */
 void loadFirstStage(