Merge branch 'master' of https://github.com/david-cattermole/mayaMatchMoveSolver into 174-core-solver-add-ceres-solver

Author: david-cattermole

src/mmSolver/adjust/adjust_relationships.cpp

@@ -65,6 +65,8 @@
 #include "mmSolver/utilities/number_utils.h"
 #include "mmSolver/utilities/string_utils.h"
 
+namespace mmsolver {
+
 /*
  * Count up number of errors to be measured in the solve.
  */
@@ -226,7 +228,7 @@ uint32_t countUpNumberOfUnknownParameters(
     std::vector<double> &out_paramUpperBoundList,
     std::vector<double> &out_paramWeightList,
     IndexPairList &out_paramToAttrList,
-    mmsolver::MatrixBool2D &out_paramFrameMatrix, MStatus &out_status) {
+    MatrixBool2D &out_paramFrameMatrix, MStatus &out_status) {
     const bool verbose = false;
     MMSOLVER_MAYA_VRB("countUpNumberOfUnknownParameters");
 
@@ -416,7 +418,7 @@ uint32_t countUpNumberOfUnknownParameters(
  */
 void findMarkerToAttributeRelationship(
     const MarkerPtrList &markerList, const AttrPtrList &attrList,
-    mmsolver::MatrixBool2D &out_markerToAttrMatrix, MStatus &out_status) {
+    MatrixBool2D &out_markerToAttrMatrix, MStatus &out_status) {
     const bool verbose = false;
     MMSOLVER_MAYA_VRB("findMarkerToAttributeRelationship");
 
@@ -525,7 +527,7 @@ void findMarkerToAttributeRelationship(
  */
 void getMarkerToAttributeRelationship(
     const MarkerPtrList &markerList, const AttrPtrList &attrList,
-    mmsolver::MatrixBool2D &out_markerToAttrMatrix, MStatus &out_status) {
+    MatrixBool2D &out_markerToAttrMatrix, MStatus &out_status) {
     const bool verbose = false;
     MMSOLVER_MAYA_VRB("getMarkerToAttributeRelationship");
 
@@ -619,8 +621,8 @@ void findErrorToParameterRelationship(
     const MTimeArray &frameList, const uint32_t numParameters,
     const uint32_t numMarkerErrors, const IndexPairList &paramToAttrList,
     const IndexPairList &errorToMarkerList,
-    const mmsolver::MatrixBool2D &markerToAttrMatrix,
-    mmsolver::MatrixBool2D &out_errorToParamMatrix, MStatus &out_status) {
+    const MatrixBool2D &markerToAttrMatrix,
+    MatrixBool2D &out_errorToParamMatrix, MStatus &out_status) {
     const bool verbose = false;
     MMSOLVER_MAYA_VRB("findErrorToParameterRelationship");
 
@@ -701,7 +703,7 @@ void calculateMarkerAndParameterCount(
     const MTimeArray &frameList, const uint32_t numParameters,
     const uint32_t numMarkerErrors, const IndexPairList &paramToAttrList,
     const IndexPairList &errorToMarkerList,
-    const mmsolver::MatrixBool2D &markerToAttrMatrix,
+    const MatrixBool2D &markerToAttrMatrix,
     const FrameSolveMode frameSolveMode,
     std::unordered_set<int32_t> &out_valid_frames,
     std::unordered_set<int32_t> &out_invalid_frames, MStatus &out_status) {
@@ -836,3 +838,5 @@ void calculateMarkerAndParameterCount(
 
     return;
 }
+
+}  // namespace mmsolver

src/mmSolver/adjust/adjust_relationships.h

@@ -49,6 +49,8 @@
 #include "mmSolver/mayahelper/maya_marker.h"
 #include "mmSolver/utilities/debug_utils.h"
 
+namespace mmsolver {
+
 typedef std::pair<int, int> IndexPair;
 typedef std::vector<std::pair<int, int> > IndexPairList;
 
@@ -97,4 +99,6 @@ void calculateMarkerAndParameterCount(
     std::unordered_set<int32_t> &out_valid_frames,
     std::unordered_set<int32_t> &out_invalid_frames, MStatus &out_status);
 
+}  // namespace mmsolver
+
 #endif  // MM_SOLVER_CORE_BUNDLE_ADJUST_RELATIONSHIPS_H

src/mmSolver/cmd/MMSolver2Cmd.cpp

@@ -128,7 +128,7 @@ MStatus MMSolver2Cmd::doIt(const MArgList &args) {
     MStatus status = parseArgs(args);
     CHECK_MSTATUS_AND_RETURN_IT(status);
     MMSOLVER_ASSERT(
-        !m_frameList.is_empty(),
+        m_frameList.length() > 0,
         "We must solve at least one frame, otherwise there's no point.");
 
     // Don't store each individual edits, just store the combination

src/mmSolver/cmd/MMSolverCmd.cpp

@@ -126,7 +126,7 @@ MStatus MMSolverCmd::doIt(const MArgList &args) {
     MStatus status = parseArgs(args);
     CHECK_MSTATUS_AND_RETURN_IT(status);
     MMSOLVER_ASSERT(
-        !m_frameList.is_empty(),
+        m_frameList.length() > 0,
         "We must solve at least one frame, otherwise there's no point.");
 
     // Don't store each individual edits, just store the combination