[sdpb] 119/233: Removed some unnecessary prototypes from SDP.h; small fixes to SDPSolver.h

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository sdpb.

commit c44a6ff4371c9ebefd8179b21c06762e5ef810cd
Author: David Simmons-Duffin <davidsd at gmail.com>
Date:   Sat Jan 3 23:45:09 2015 +1300

    Removed some unnecessary prototypes from SDP.h; small fixes to SDPSolver.h
---
 src/SDP.cpp     | 8 ++++----
 src/SDP.h       | 8 +-------
 src/SDPSolver.h | 4 ++--
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/SDP.cpp b/src/SDP.cpp
index dc869c0..81b53df 100644
--- a/src/SDP.cpp
+++ b/src/SDP.cpp
@@ -75,9 +75,9 @@ dualConstraintGroupFromPolVecMat(const PolynomialVectorMatrix &m) {
   return g;
 }
 
-SDP sdpFromConstraintGroups(const Vector &objective,
-                 const Real &objectiveConst,
-                 const vector<DualConstraintGroup> &dualConstraintGroups) {
+SDP sdpFromDualConstraintGroups(const Vector &objective,
+                                const Real &objectiveConst,
+                                const vector<DualConstraintGroup> &dualConstraintGroups) {
   SDP sdp;
   sdp.dualObjective  = objective;
   sdp.objectiveConst = objectiveConst;
@@ -128,6 +128,6 @@ SDP bootstrapSDP(const Vector &affineObjective,
   objective.erase(objective.begin());
   Real objectiveConst = affineObjective[0];
 
-  return sdpFromConstraintGroups(objective, objectiveConst, dualConstraintGroups);
+  return sdpFromDualConstraintGroups(objective, objectiveConst, dualConstraintGroups);
 }
 
diff --git a/src/SDP.h b/src/SDP.h
index c2c0bc6..47f6189 100644
--- a/src/SDP.h
+++ b/src/SDP.h
@@ -238,7 +238,7 @@ class SDP {
 // DualConstraintGroup's are currently only used as an intermediate
 // data structure between the matrix polynomials defining an MPP and a
 // full SDP.  By directly combining DualConstraintGroups into an SDP
-// using sdpFromConstraintGroups, it is possible to define slightly
+// using sdpFromDualConstraintGroups, it is possible to define slightly
 // more general optimization problems than those produced by
 // bootstrapSDP.  Perhaps this level of generality will be useful in
 // the future.
@@ -325,12 +325,6 @@ class PolynomialVectorMatrix {
   }
 };
 
-DualConstraintGroup dualConstraintGroupFromPolVecMat(const PolynomialVectorMatrix &m);
-
-SDP sdpFromConstraintGroups(const Vector &objective,
-                            const Real &objectiveConst,
-                            const vector<DualConstraintGroup> &dualConstraintGroups);
-
 SDP bootstrapSDP(const Vector &affineObjective,
                  const vector<PolynomialVectorMatrix> &polVectorMatrices);
 
diff --git a/src/SDPSolver.h b/src/SDPSolver.h
index d145f44..17fdb75 100644
--- a/src/SDPSolver.h
+++ b/src/SDPSolver.h
@@ -154,7 +154,7 @@ public:
   // BlockDiagonalMatrix with the same structure as X, called 'P' in
   // the manual:
   //
-  //   PrimalResidues = \sum_P A_p x_p - X
+  //   PrimalResidues = \sum_p A_p x_p - X
   //
   BlockDiagonalMatrix PrimalResidues;
 
@@ -272,7 +272,7 @@ public:
   // a vector of length N', needed for the LU decomposition of Q.
   vector<Integer> Qpivots;
 
-  // dyExtended = (dy z), where z are the extra coordinates introduced
+  // dyExtended = (dy, z), where z are the extra coordinates introduced
   // in the stabilized Schur complement equation.
   Vector dyExtended;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdpb.git