Chg Ordi

Author: deseilligny

MMVII/include/MMVII_Geom2D.h

@@ -845,6 +845,8 @@ struct cSaveExtrEllipe
 {
      public :
           cSaveExtrEllipe (const cCircTargExtr &,const std::string & aNameCode);
+          cSaveExtrEllipe (const cEllipse &,int aBlack,int aWhite,const std::string & aNameCode);
+
           cSaveExtrEllipe ();
           static std::string NameFile(const cPhotogrammetricProject & ,const cSetMesPtOf1Im &,bool Input);
 

MMVII/include/MMVII_nums.h

@@ -950,8 +950,9 @@ class cCelCC : public cMemCheck
         size_t               mLowCode;    ///< lower representant
         bool                 mTmp;        ///< some marker to use when convenient
         int                  mNum;        ///< Num used so that names is alway the same whatever maybe the selection
+        bool                 mSelfSym;    ///< is the code self sym with permutation of system
 
-	size_t HammingDist(const cCelCC &) const;
+        size_t HammingDist(const cCelCC &) const;
 
         cCelCC(size_t aLowestCode);
      public :

MMVII/src/CodedTarget/cCheckBoardTargetExtract.cpp

@@ -556,6 +556,7 @@ void  cAppliCheckBoardTargetExtract::AddCdtE(const cCdEllipse & aCDE)
 
 void  cAppliCheckBoardTargetExtract::DoExport()
 {
+     std::vector<cSaveExtrEllipe>  aVSavE;
      cSetMesPtOf1Im  aSetM(FileOfPath(mNameIm));
      for (const auto & aCdtM : mVCdtMerged)
      {
@@ -565,11 +566,18 @@ void  cAppliCheckBoardTargetExtract::DoExport()
              cMesIm1Pt aMesIm(aCdtM.mC0,aCode,1.0);
              aSetM.AddMeasure(aMesIm);
              Tpl_AddOneObjReportCSV(*this,mIdExportCSV,aMesIm);
+
+
+             cSaveExtrEllipe aSEE(aCdtM.Ell(),aCdtM.mBlack,aCdtM.mWhite,aCode);
+             aVSavE.push_back(aSEE);
+             //  cSaveExtrEllipe anESave(*anEE,aCode);
          }
      }
 
      aSetM.SortMes();
      mPhProj.SaveMeasureIm(aSetM);
+
+     SaveInFile(aVSavE,cSaveExtrEllipe::NameFile(mPhProj,aSetM,false));
 }
 
 void cAppliCheckBoardTargetExtract::DoOneImage() 

MMVII/src/CodedTarget/cCircTargetExtract.cpp

@@ -168,12 +168,20 @@ void cCircTargExtr::RefinePosBySym(tREAL8 aStepLim,const tDIm & aDIm ,const cDif
 /*                                               */
 /* ********************************************* */
 
+
+cSaveExtrEllipe::cSaveExtrEllipe(const cEllipse & anEllipse,int aBlack,int aWhite,const std::string & aNameCode) :
+    mEllipse  (anEllipse),
+    mNameCode (aNameCode),
+    mBlack    (aBlack),
+    mWhite    (aWhite)
+{
+}
+
+
 cSaveExtrEllipe::cSaveExtrEllipe(const cCircTargExtr & aCTE,const std::string & aCode) :
-    mEllipse  (aCTE.mEllipse),
-    mNameCode (aCode),
-    mBlack    (aCTE.mVBlack),
-    mWhite    (aCTE.mVWhite)
+    cSaveExtrEllipe(aCTE.mEllipse,aCTE.mVBlack,aCTE.mVWhite,aCode)
 {
+
 }
 
 

MMVII/src/CodedTarget/cGenerateEncoding.cpp

@@ -407,6 +407,13 @@ int  cAppliGenerateEncoding::Exe()
 
    //  [1] =============   read initial value of cells
    mCEC = cCompEquiCodes::Alloc(mSpec.mNbBits,mPerCircPerm,mMiror);
+   /*
+   if (1)
+   {
+       for (const auto & aCEC : *mCEC)
+           if (aCEC-)
+   }
+   */
    mVOC = mCEC->VecOfCells();
    StdOut() <<  "Size Cells init " << mVOC.size() << std::endl;
 

MMVII/src/Geom2D/cEllipse2D.cpp

@@ -129,9 +129,9 @@ void cEllipse::AddData(const  cAuxAr2007 & anAux)
      //  MMVII::AddData(cAuxAr2007("C0",anAux),mC0);
      {
          cAuxAr2007 anAuxGeom("GeomForComment",anAux);
-	 MMVII::AddData(cAuxAr2007("LengthGreadAxe",anAuxGeom),mLGa);
+	 MMVII::AddData(cAuxAr2007("LengthGreatAxe",anAuxGeom),mLGa);
 	 MMVII::AddData(cAuxAr2007("LengthSmallAxe",anAuxGeom),mLSa);
-	 MMVII::AddData(cAuxAr2007("DirGreadAxe",anAuxGeom),mVGa);
+	 MMVII::AddData(cAuxAr2007("DirGreatAxe",anAuxGeom),mVGa);
          anAuxGeom.Ar().AddComment("GA=" + ToStr(mLGa) + " SA=" + ToStr(mLSa));
      }
      if (anAux.Input())

MMVII/src/UtiMaths/bitcoding.cpp

@@ -245,7 +245,8 @@ size_t MaxRun2Length(tU_INT4 aVal,size_t aPow2)
 
 cCelCC::cCelCC(size_t aLowestCode) :
     mLowCode       (aLowestCode),
-    mNum           (-1)
+    mNum           (-1),
+    mSelfSym       (false)
 {
 }
 
@@ -281,22 +282,22 @@ cCompEquiCodes::cCompEquiCodes(size_t aNbBits,size_t aPer,bool WithMirror) :
      MMVII_INTERNAL_ASSERT_strong((aNbBits%aPer)==0,"NbBit not multiple of period in cCompEquiCodes");
      for (size_t aCode=0 ; aCode < mNbCodeUC ; aCode++)
      {
-          if (mVCodes2Cell[aCode] == nullptr)
-	  {
+         if (mVCodes2Cell[aCode] == nullptr)
+         {
               cCelCC * aNewCel = new cCelCC(aCode);
               aNewCel->mNum = mVecOfCells.size();
-	      mVecOfCells.push_back(aNewCel);
+              mVecOfCells.push_back(aNewCel);
 
-	      AddCodeWithPermCirc(aCode,aNewCel);
-	      if (WithMirror)
-	          AddCodeWithPermCirc(BitMirror(aCode,mNbCodeUC),aNewCel);
+              AddCodeWithPermCirc(aCode,aNewCel);
+              if (WithMirror)
+                AddCodeWithPermCirc(BitMirror(aCode,mNbCodeUC),aNewCel);
 
-	      AddAndResizeUp(mHistoNbBit,NbBits(aCode),1);
-	  }
-	  else
-	  {
+             AddAndResizeUp(mHistoNbBit,NbBits(aCode),1);
+         }
+         else
+         {
               // Nothing to do, code has been processed by equivalent lower codes
-	  }
+         }
      }
 
      //for (const auto & AC : mVecOfCells)
@@ -345,6 +346,8 @@ cCelCC *  cCompEquiCodes::CellOfCode(size_t aCode)
 
 void cCompEquiCodes::AddCodeWithPermCirc(size_t aCode,cCelCC * aNewCel)
 {
+    size_t aCodeInit = aCode;    // used to compute selfSimFound
+
    for (size_t aBit=0 ; aBit<mNbBits ; aBit+=mPeriod)
    {
        // Test because code may have already been processed i
@@ -354,6 +357,8 @@ void cCompEquiCodes::AddCodeWithPermCirc(size_t aCode,cCelCC * aNewCel)
             mVCodes2Cell[aCode] = aNewCel;
             aNewCel->mEquivCode.push_back(aCode);
        }
+       if ((aBit!=0) && (aCode==aCodeInit))
+           aNewCel->mSelfSym = true;
        aCode = N_LeftBitsCircPerm(aCode,mNbCodeUC,mPeriod);
    }
 }