circuit fixes

ladnir · Apr 23, 2024 · 0d5cb49 · 0d5cb49
1 parent 9cb0089
commit 0d5cb49
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/cryptoTools/Circuit/BetaCircuit.cpp b/cryptoTools/Circuit/BetaCircuit.cpp
@@ -140,8 +140,8 @@ namespace osuCrypto
  if(out >= mWireCount)
  throw std::runtime_error(LOCATION);
 
- if (aIdx == bIdx)
- throw std::runtime_error(LOCATION);
+ //if (aIdx == bIdx)
+ //throw std::runtime_error(LOCATION);
  //std::cout << "add "<<mGates.size() << ": " << aIdx <<" "<< bIdx <<" " << gateToString(gt) << " " << out << std::endl;
 
  auto

diff --git a/cryptoTools/Circuit/MxBit.h b/cryptoTools/Circuit/MxBit.h
@@ -325,6 +325,15 @@ namespace osuCrypto
  }
 
  bool hasValue() const { return mVal != u64(-1); }
+
+ bool operator==(const Address& a) const
+ {
+ return mVal == a.mVal;
+ }
+ bool operator!=(const Address& a) const
+ {
+ return !(*this == a);
+ }
  private:
  u64 mVal = u64(-1);
  };

diff --git a/cryptoTools/Circuit/MxCircuit.cpp b/cryptoTools/Circuit/MxCircuit.cpp
@@ -136,8 +136,6 @@ namespace osuCrypto
  if (addressMap.hasMapping(idx))
  {
  auto outIdx = addressMap[idx];
- if (outIdx == 131)
- std::cout << "here" << std::endl;
  }
  switch (node.mType)
  {

diff --git a/cryptoTools/Circuit/MxCircuit.h b/cryptoTools/Circuit/MxCircuit.h
@@ -339,6 +339,9 @@ namespace osuCrypto
 
  Bit addGate(OpType t, const Bit& a, const Bit& b)
  {
+ //if (a.mAddress == b.mAddress && a.mAddress.hasValue())
+ // throw std::runtime_error("illegal to provide the same bit. " LOCATION);
+
  Bit ret;
  ret.mCir = this;
  ret.mAddress = Address(mGates.size(), 0);