Self Sym Option in gen encoding

Author: deseilligny

MMVII/src/CodedTarget/cGenerateEncoding.cpp

@@ -227,6 +227,7 @@ class cAppliGenerateEncoding : public cMMVII_Appli
 	size_t                mPerCircPerm;
 	bool                  mMiror;
 	bool                  mOkSelfSym;
+    bool                  mShowSelfSym;
 	bool                  mUseAiconCode;
 	cCompEquiCodes  *     mCEC;
 	std::vector<cCelCC*>  mVOC;
@@ -250,6 +251,7 @@ cAppliGenerateEncoding::cAppliGenerateEncoding
    mPhProj        (*this),
    mMiror         (false),
    mOkSelfSym     (true),
+   mShowSelfSym   (false),
    mCEC           (nullptr)
 {
 }
@@ -278,7 +280,7 @@ cCollecSpecArg2007 & cAppliGenerateEncoding::ArgOpt(cCollecSpecArg2007 & anArgOp
                << AOpt2007(mSpec.mUseHammingCode,"UHC","Use Hamming code")
                << AOpt2007(mSpec.mPrefix,"Prefix","Prefix for output files")
                << AOpt2007(mMiror,"Mir","Unify mirro codes")
-               << AOpt2007(mOkSelfSym,"OkSelfSym","Accept code with self symetry on period")
+               << AOpt2007(mOkSelfSym,"OkSelfSym","Accept code with self symetry on period",{eTA2007::HDV})
                << AOpt2007(mNameOut,"Out","Name for output file")
                << AOpt2007(mPostfixOut,"Postfix","Postfix for output file (def->default tagged extension")
                <<   mPhProj.DPGndPt3D().ArgDirInOpt("GCPNames","Dir GCP for code selection on names")
@@ -411,16 +413,16 @@ int  cAppliGenerateEncoding::Exe()
    //  [1] =============   read initial value of cells
    mCEC = cCompEquiCodes::Alloc(mSpec.mNbBits,mPerCircPerm,mMiror,mOkSelfSym);
 
-   /*
-   if (1)
+
+   if (mShowSelfSym)
    {
-       for (const auto & aCEC : *mCEC)
-           if (aCEC)
+       for (const auto & aCEC : mCEC->VecOfCells() )
+           if (aCEC && aCEC->mSelfSym)
            {
-
+               StdOut() << " SSC " << StrOfBitFlag(aCEC->mLowCode,1<<mSpec.mNbBits) << "\n";
            }
    }
-   */
+
 
    mVOC = mCEC->VecOfCells();
    StdOut() <<  "Size Cells init " << mVOC.size() << std::endl;
@@ -454,13 +456,16 @@ int  cAppliGenerateEncoding::Exe()
               MMVII_INTERNAL_ASSERT_bench(aVCode[aK-1].y() < aVCode[aK].y(),"Not growing order for bitflag in 3D-AICON");
 	  }
 
-          for (size_t aK=0 ; aK<aVCode.size(); aK++)
-	  {
-		 cCelCC * aCel = mCEC->CellOfCode(aVCode[aK].y());
-                 aCel->mNum = aVCode[aK].x();
-                 MMVII_INTERNAL_ASSERT_bench(aCel!=0,"CellOfCode in3D AICON");
-                 MMVII_INTERNAL_ASSERT_bench(aVCode[aK].y()==(int)aCel->mLowCode,"CellOfCode in3D AICON");
-	  }
+      for (size_t aK=0 ; aK<aVCode.size(); aK++)
+      {
+           cCelCC * aCel = mCEC->CellOfCode(aVCode[aK].y());
+           if (aCel)
+           {
+                aCel->mNum = aVCode[aK].x();
+                MMVII_INTERNAL_ASSERT_bench(aCel!=0,"CellOfCode in3D AICON");
+                MMVII_INTERNAL_ASSERT_bench(aVCode[aK].y()==(int)aCel->mLowCode,"CellOfCode in3D AICON");
+            }
+      }
 
 
        }

MMVII/src/UtiMaths/bitcoding.cpp

@@ -299,15 +299,18 @@ cCompEquiCodes::cCompEquiCodes(size_t aNbBits,size_t aPer,bool WithMirror,bool O
      {
          if (mVCodes2Cell[aCode] == nullptr)
          {
-              cCelCC * aNewCel = new cCelCC(aCode);
-              aNewCel->mNum = mVecOfCells.size();
-              mVecOfCells.push_back(aNewCel);
-
-              AddCodeWithPermCirc(aCode,aNewCel);
-              if (WithMirror)
-                AddCodeWithPermCirc(BitMirror(aCode,mNbCodeUC),aNewCel);
-
-             AddAndResizeUp(mHistoNbBit,NbBits(aCode),1);
+             if (OkSelfSym  || (! CodeIsSelfmSym(aCode,mNbBits,mPeriod)))
+             {
+                 cCelCC * aNewCel = new cCelCC(aCode);
+                 aNewCel->mNum = mVecOfCells.size();
+                 mVecOfCells.push_back(aNewCel);
+
+                 AddCodeWithPermCirc(aCode,aNewCel);
+                if (WithMirror)
+                   AddCodeWithPermCirc(BitMirror(aCode,mNbCodeUC),aNewCel);
+
+                 AddAndResizeUp(mHistoNbBit,NbBits(aCode),1);
+             }
          }
          else
          {
@@ -374,20 +377,25 @@ void cCompEquiCodes::AddCodeWithPermCirc(size_t aCode,cCelCC * aNewCel)
    }
    aNewCel->mSelfSym = CodeIsSelfmSym(aCode,mNbBits,mPeriod);
 
-   if (  aNewCel->mSelfSym )
-       StdOut() << " SelfSym " << StrOfBitFlag(aCode,1<<mNbBits) << "\n";
 }
 
 const std::vector<cCelCC*>  & cCompEquiCodes::VecOfCells() const {return mVecOfCells;}
 
 
 std::vector<cCelCC*>  cCompEquiCodes::VecOfUsedCode(const std::vector<cPt2di> & aVXY,bool Used)
 {
+    //  StdOut() << " LllLL=" << __LINE__ << "\n";
+
     for (auto aPCel : mVecOfCells)
+    {
        aPCel->mTmp = false;
+    }
 
     for (auto aXY : aVXY)
-       mVCodes2Cell[aXY.y()]->mTmp = true;
+    {
+        if (mVCodes2Cell[aXY.y()])
+            mVCodes2Cell[aXY.y()]->mTmp = true;
+    }
 
     std::vector<cCelCC*> aRes;
     for (auto aPCel : mVecOfCells)
@@ -448,15 +456,16 @@ void  TestComputeCoding(size_t aNBBCoding,int aParity,size_t)
    std::unique_ptr<cCompEquiCodes> aCEC (cCompEquiCodes::Alloc(aNBBCoding));
    for (const auto & aPCel : aCEC->VecOfCells())
    {
-	size_t aCode =  aPCel->mLowCode;
-        int aNbB = NbBits(aCode);
-	bool takeIt = (aNbB%2==0)  ? ((aParity & 2)!=0)  : ((aParity & 1) !=0);
+      // StdOut() << "LLL=" << __LINE__  << "Ptr=" << aPCel << "\n";
+       size_t aCode =  aPCel->mLowCode;
+       int aNbB = NbBits(aCode);
+       bool takeIt = (aNbB%2==0)  ? ((aParity & 2)!=0)  : ((aParity & 1) !=0);
 
-	if (takeIt)
-	{
+       if (takeIt)
+       {
          size_t aLenRun = MaxRun2Length(aCode,size_t(1)<<aNBBCoding);
-	     aVCodeByRun.at(aLenRun).push_back(aPCel);
-	}
+         aVCodeByRun.at(aLenRun).push_back(aPCel);
+       }
    }
 
    int aCumul=0;