In adding self sym in coded target generate

Author: deseilligny

MMVII/include/MMVII_nums.h

@@ -969,7 +969,7 @@ class cCompEquiCodes : public cMemCheck
        static std::string NameCERNLookUpTable(size_t aNbBits); ///< name of file where are stored CERN'S   LUT
        static std::string NameCERNPannel(size_t aNbBits); ///< name of file where are stored CERN'S   3D target
        ///  allocate & compute code , return the same adress if param eq
-       static cCompEquiCodes * Alloc(size_t aNbBits,size_t aPerAmbig=1,bool WithMirror=false);
+       static cCompEquiCodes * Alloc(size_t aNbBits,size_t aPerAmbig=1,bool WithMirror=false,bool OkSelfSym=true);
 
        /// For a set code (p.y()) return the cell containing them (or not contatining them)
        std::vector<cCelCC*>  VecOfUsedCode(const std::vector<cPt2di> &,bool Used);
@@ -986,7 +986,7 @@ class cCompEquiCodes : public cMemCheck
    private :
        static std::string NameCERStuff(const std::string & aPrefix,size_t aNbBits); ///< name of file where are stored CERN'S   3D target
 
-       cCompEquiCodes(size_t aNbBits,size_t aPerdAmbig,bool WithMirror);
+       cCompEquiCodes(size_t aNbBits,size_t aPerdAmbig,bool WithMirror,bool OkSelfSym);
        /// put all the code identic, up to a circular permutation, in the same cellu
        void AddCodeWithPermCirc(size_t aCode,cCelCC *);
 

MMVII/src/CodedTarget/cGenerateEncoding.cpp

@@ -226,6 +226,7 @@ class cAppliGenerateEncoding : public cMMVII_Appli
 	int                   mP2;
 	size_t                mPerCircPerm;
 	bool                  mMiror;
+	bool                  mOkSelfSym;
 	bool                  mUseAiconCode;
 	cCompEquiCodes  *     mCEC;
 	std::vector<cCelCC*>  mVOC;
@@ -248,6 +249,7 @@ cAppliGenerateEncoding::cAppliGenerateEncoding
    cMMVII_Appli   (aVArgs,aSpec),
    mPhProj        (*this),
    mMiror         (false),
+   mOkSelfSym     (true),
    mCEC           (nullptr)
 {
 }
@@ -276,6 +278,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(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")
@@ -406,14 +409,19 @@ int  cAppliGenerateEncoding::Exe()
    mP2 = (1<<mSpec.mNbBits);
 
    //  [1] =============   read initial value of cells
-   mCEC = cCompEquiCodes::Alloc(mSpec.mNbBits,mPerCircPerm,mMiror);
+   mCEC = cCompEquiCodes::Alloc(mSpec.mNbBits,mPerCircPerm,mMiror,mOkSelfSym);
+
    /*
    if (1)
    {
        for (const auto & aCEC : *mCEC)
-           if (aCEC-)
+           if (aCEC)
+           {
+
+           }
    }
    */
+
    mVOC = mCEC->VecOfCells();
    StdOut() <<  "Size Cells init " << mVOC.size() << std::endl;
 

MMVII/src/UtiMaths/bitcoding.cpp

@@ -127,6 +127,21 @@ size_t  N_LeftBitsCircPerm(size_t aSetFlag,size_t aPow2,size_t N)
 }
 
 
+bool CodeIsSelfmSym(size_t aCode,size_t aNbBits,size_t aPeriod)
+{
+   size_t aCodeInit = aCode;    // used to compute selfSimFound
+
+   for (size_t aBit=0 ; aBit<aNbBits ; aBit+=aPeriod)
+   {
+       if  ((aBit!=0) && (aCode==aCodeInit))
+          return true;
+
+       aCode = N_LeftBitsCircPerm(aCode,1<<aNbBits,aPeriod);
+
+   }
+    return false;
+}
+
 /// make a symetry bits, assuming a size NbIt, with  aPow2= NbBit^2
 
 size_t  BitMirror(size_t aSetFlag,size_t aPow2) 
@@ -273,7 +288,7 @@ size_t cCelCC::HammingDist(const cCelCC & aC2) const
 
 //std::map<std::string,cCompEquiCodes*> cCompEquiCodes::TheMapCodes;
 
-cCompEquiCodes::cCompEquiCodes(size_t aNbBits,size_t aPer,bool WithMirror) :
+cCompEquiCodes::cCompEquiCodes(size_t aNbBits,size_t aPer,bool WithMirror,bool OkSelfSym) :
      mNbBits       (aNbBits),
      mPeriod       (aPer),
      mNbCodeUC     (size_t(1)<<mNbBits),
@@ -309,9 +324,9 @@ cCompEquiCodes::~cCompEquiCodes()
      DeleteAllAndClear(mVecOfCells);
 }
 
-cCompEquiCodes * cCompEquiCodes::Alloc(size_t aNbBits,size_t aPer,bool WithMirror)
+cCompEquiCodes * cCompEquiCodes::Alloc(size_t aNbBits,size_t aPer,bool WithMirror,bool OkSelfSym)
 {
-     return  new cCompEquiCodes(aNbBits,aPer,WithMirror);
+     return  new cCompEquiCodes(aNbBits,aPer,WithMirror,OkSelfSym);
      /*
      std::string aInd = ToStr(aNbBits)+"_"+ ToStr(aPer) + "_" +ToStr(WithMirror);
      cCompEquiCodes* & aRef = TheMapCodes[aInd];
@@ -346,8 +361,6 @@ 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
@@ -357,10 +370,12 @@ 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);
    }
+   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;}