simulation version 1.0

Author: B03901108

DSnP2016/fraig/cirGate.cpp

@@ -40,27 +40,46 @@ vector< vector<unsigned> > CirGate::FECGSet = vector< vector<unsigned> >();
 
 void
 CirGate::reportGate() const {
-   unsigned intSored = bitList[fanin[0] / 2];
+   unsigned i, j, k, x, numPrinted;
    char bitStored[32];
-   for (char i = 32; i > 0; --i, intSored /= 2) bitStored[i - 1] = ('0' + (intSored % 2));
+   unsigned intSored = bitList[fanin[0] / 2];
+   for (i = 32; i > 0; --i, intSored /= 2) bitStored[i - 1] = ('0' + (intSored % 2));
 
-   char j = 12 + (char(getTypeStr().length())) + uIntLen(fanin[0] / 2) + uIntLen(lineNo);
+   j = 12 + getTypeStr().length() + uIntLen(fanin[0] / 2) + uIntLen(lineNo);
    if (symbol.length() != 0) j += (symbol.length() + 2);
-   for (char i = 0; i < 50; ++i) cout << '=';
+   for (i = 0; i < 50; ++i) cout << '=';
    cout << "\n= " << getTypeStr() << '(' << (fanin[0] / 2) << ')';
    if (symbol.length() != 0) cout << '\"' << symbol << '\"';
    cout << ", line " << lineNo;
    for (; j < 50; ++j) cout << ' '; cout << "=\n";
 
-   cout << "= FECs:"; cout << "=";
+   intSored = FECNo;
+   cout << "= FECs:";
+   if (!intSored) for (i = 0; i < 41; ++i) cout << ' ';
+   else {
+      j = (--intSored) % 2;
+      intSored  /= 2;
+      for (k = 0, x = FECGSet[intSored].size(), i = 0; k < x; ++k) {
+         numPrinted = FECGSet[intSored][k];
+         if (numPrinted / 2 != fanin[0] / 2) {
+            i += (1 + uIntLen(numPrinted / 2));
+            cout << ' ';
+            if ((numPrinted + j) % 2) { ++i; cout << '!'; }
+            cout << numPrinted / 2;
+         }
+      }
+      for (; i < 41; ++i) cout << ' ';
+   }
+   cout << " =";
 
    cout << "\n= Value: ";
-   for (char i = 0; i < 32; ++i) {
-       if ((i % 4 == 0) && (i != 0)) cout << '_';
+   cout << bitStored[0];
+   for (i = 1; i < 32; ++i) {
+       if (i % 4 == 0) cout << '_';
        cout << bitStored[i];
    }
    cout << " =\n";
-   for (char i = 0; i < 50; ++i) cout << '=';
+   for (i = 0; i < 50; ++i) cout << '=';
    cout << endl;
 }
 

DSnP2016/fraig/cirSim.cpp

@@ -166,8 +166,15 @@ CirMgr::randomSim() {
 void
 CirMgr::fileSim(ifstream& patternFile) {
    unsigned i, x, j, y;
+   string patIn;
    vector<unsigned> dummyArr;
+   vector< vector<unsigned> > newFECG;
+   unsigned remainTime = 0;
+   size_t caseCount = 0;
+   unsigned* bl = CirGate::bitList;
+   unsigned* caseOut = new unsigned[param[2]];
    CirGate** g = CirGate::gateArr;
+
    if (!hasBeenSim) {
       CirGate::FECGSet.push_back(vector<unsigned>());
       CirGate::FECGSet[0].push_back(0);
@@ -179,23 +186,46 @@ CirMgr::fileSim(ifstream& patternFile) {
          g[i] = (CirGate*)(((size_t)g[i]) - 1);
          CirGate::flipped.pop_back();
       }
-      if (CirGate::FECGSet[0].size() < 2) { CirGate::FECGSet.clear(); return; }
+      if (CirGate::FECGSet[0].size() < 2) CirGate::FECGSet.clear();
    } else for (i = 0, x = CirGate::FECGSet.size(); i < x; ++i)
       for (j = 0, y = CirGate::FECGSet[i].size(); j < y; ++j) {
          CirGate::FECGSet[i][j] /= 2;
          g[CirGate::FECGSet[i][j]]->FECNo = 0;
       }
+   
+   dummyArr.clear(); remainTime = 0;
+   while (patternFile >> patIn) {
+      x = patIn.size();
+      if (x != param[1]) {
+         cout << "Error: Pattern(" << patIn << ") length(" << x
+            << ") does not match the number of inputs(" << param[1] << ") in a circuit!!" << endl;
+         dummyArr.clear();
+         caseCount = 0;
+         break;
+      }
+      for (i = 0; i < x; ++i) if ((patIn[i] != '0') && (patIn[i] != '1')) {
+         cout << "Error: Pattern(" << patIn << ") contains a non-0/1 character(\'"
+            << patIn[i] << "\')." << endl;
+         dummyArr.clear();
+         caseCount = 0;
+         remainTime = 1;
+         break;
+      }
+      if (remainTime) break;
+      
+      ++caseCount;
+      if (caseCount % 32 == 1) {
+         j = 1;
+         for (i = 0; i < x; ++i) dummyArr.push_back((unsigned)(patIn[i] - '0'));
+      } else {
+         j = j << 1;
+         for (i = 0; i < x; ++i) if (patIn[i] == '1') dummyArr[dummyArr.size() - x + i] += j;
+      }
 
-   vector< vector<unsigned> > newFECG;
-   unsigned remainTime = 0;
-   size_t caseCount = 0;
-   unsigned* bl = CirGate::bitList;
-   unsigned* caseIn = new unsigned[param[1]];
-   unsigned* caseOut = new unsigned[param[2]];
-   while ((CirGate::FECGSet.size()) && (remainTime < 5)) {
-      caseGen(caseIn, param[1]);
-      caseCount += 32;
-      for (i = 0, x = param[1]; i < x; ++i) bl[PIList[i]] = caseIn[i];
+   }
+
+   for (unsigned k = 0, z = dummyArr.size(), l = param[1]; k < z; k += l) {
+      for (i = 0; i < l; ++i) bl[PIList[i]] = dummyArr[k + i];
       for (i = param[0] + 1, x = i + param[2], j = 0; i < x; ++i, ++j) {
          bitSim(i);
          caseOut[j] = bl[i];
@@ -206,16 +236,15 @@ CirMgr::fileSim(ifstream& patternFile) {
          CirGate::flipped.pop_back();
       }
       if (_simLog) for (i = 0; i < 32; ++i) {
-         for (j = 0, y = param[1]; j < y; ++j) { (*_simLog) << (caseIn[j] % 2); caseIn[j] /= 2; }
+         for (j = 0; j < l; ++j) { (*_simLog) << (dummyArr[k + j] % 2); dummyArr[k + j] /= 2; }
          (*_simLog) << ' ';
          for (j = 0, y = param[2]; j < y; ++j) { (*_simLog) << (caseOut[j] % 2); caseOut[j] /= 2; }
          (*_simLog) << endl;
       }
 
       y = 0; //changeExist
       for (i = 0, x = CirGate::FECGSet.size(); i < x; ++i) if (FECGHash(i, newFECG)) ++y;
-      if (y) { remainTime = 0; CirGate::FECGSet.swap(newFECG); }
-      else ++remainTime;
+      if (y) CirGate::FECGSet.swap(newFECG);
       newFECG.clear();
    }
 
@@ -237,7 +266,6 @@ CirMgr::fileSim(ifstream& patternFile) {
 
    hasBeenSim = true;
    delete [] caseOut;
-   delete [] caseIn;
    cout << caseCount << " patterns simulated." << endl;
 }