test pts no obs 2d shur

micmacIGN · Jan 18, 2024 · e38248a · e38248a
1 parent 6ad1c04
commit e38248a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/MMVII/src/BundleAdjustment/cAppliBundAdj.cpp b/MMVII/src/BundleAdjustment/cAppliBundAdj.cpp
@@ -197,7 +197,7 @@ int cAppliBundlAdj::Exe()
         {
              mPhProj.LoadIm(aFullMesGCP,aSens->NameImage(),aSens,true);
         }
-	cSetMesImGCP * aMesGCP = aFullMesGCP.FilterNonEmptyMeasure();
+	cSetMesImGCP * aMesGCP = aFullMesGCP.FilterNonEmptyMeasure(0);
 
 	cStdWeighterResidual aWeighter(mGCPW,1);
 	mBA.AddGCP(mGCPW.at(0),aWeighter,aMesGCP);

diff --git a/MMVII/src/Matrix/cInputOutputRSNL.cpp b/MMVII/src/Matrix/cInputOutputRSNL.cpp
@@ -196,8 +196,9 @@ template <class Type> void cSetIORSNL_SameTmp<Type>::AddOneEq(const tIO_OneEq &
     mNbEq += anIO.mVals.size();
     if 
     (
-            (mNbEq > mNbTmpUk)  // A priori there is no use to less or equal equation, this doesnt give any constraint
-	 && ( mSetIndTmpUk.NbElem()== mNbTmpUk)  // we are sure to have good index, because we cannot add oustide
+            (mNbEq >= mNbTmpUk)  // A priori there is no use to less or equal equation, this doesnt give any constraint
+                                 // but useful for GCP with 3d constraints and no 2d obs
+            && ( mSetIndTmpUk.NbElem()== mNbTmpUk)  // we are sure to have good index, because we cannot add oustide
     )
     {
         mOk = true; 

diff --git a/MMVII/src/Matrix/cLeasSqtAA.cpp b/MMVII/src/Matrix/cLeasSqtAA.cpp
@@ -69,6 +69,8 @@ template <class Type>
      mSetInd.MakeInvertIndex();
 
      mNbUk = mSetInd.mVIndOcc.size();
+     if (mNbUk==0) return; // nothing to substitute
+
      mNbUkTot = mNbUk + mNbTmp;
 
      // Adjust size, initialize of mSysRed