Skip to content
This repository has been archived by the owner on Jun 15, 2023. It is now read-only.

Commit

Permalink
makeIdent() now returns a terminal node. Trace checks for terminal be…
Browse files Browse the repository at this point in the history 
…fore calculation.
  • Loading branch information
@aaronleesander
aaronleesander committed Jun 14, 2023
1 parent 0ed4257 commit 9370f6d
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 44 deletions.
42 changes: 13 additions & 29 deletions include/dd/Package.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2066,7 +2066,15 @@ namespace dd {
public:
mEdge partialTrace(const mEdge& a, const std::vector<bool>& eliminate) {
[[maybe_unused]] const auto before = cn.cacheCount();
const auto result = trace(a, eliminate);
mEdge result;
// Check for identity case
if (a.isTerminal()) {
auto relevantQubits = std::count(eliminate.begin(), eliminate.end(), true);
auto ones = std::pow(2, relevantQubits);
result = mEdge::terminal(cn.lookup(ones));
} else {
result = trace(a, eliminate);
}
[[maybe_unused]] const auto after = cn.cacheCount();
assert(before == after);
return result;
Expand Down Expand Up @@ -2220,34 +2228,10 @@ namespace dd {
///
/// Identity matrices
///
// create n-qubit identity DD. makeIdent(n) === makeIdent(0, n-1)
// mEdge makeIdent(QubitCount n) { return makeIdent(0, static_cast<Qubit>(n - 1)); }
// mEdge makeIdent(Qubit leastSignificantQubit, Qubit mostSignificantQubit) {
// if (mostSignificantQubit < leastSignificantQubit) {
// return mEdge::one;
// }
//
// if (leastSignificantQubit == 0 && idTable[static_cast<std::size_t>(mostSignificantQubit)].p != nullptr) {
// return idTable[static_cast<std::size_t>(mostSignificantQubit)];
// }
// if (mostSignificantQubit >= 1 && (idTable[static_cast<std::size_t>(mostSignificantQubit - 1)]).p != nullptr) {
// idTable[static_cast<std::size_t>(mostSignificantQubit)] = makeDDNode(mostSignificantQubit,
// std::array{idTable[static_cast<std::size_t>(mostSignificantQubit - 1)],
// mEdge::zero,
// mEdge::zero,
// idTable[static_cast<std::size_t>(mostSignificantQubit - 1)]});
// return idTable[static_cast<std::size_t>(mostSignificantQubit)];
// }
//
// auto e = makeDDNode(leastSignificantQubit, std::array{mEdge::one, mEdge::zero, mEdge::zero, mEdge::one});
// for (auto k = static_cast<std::size_t>(leastSignificantQubit + 1); k <= static_cast<std::make_unsigned_t<Qubit>>(mostSignificantQubit); k++) {
// e = makeDDNode(static_cast<Qubit>(k), std::array{e, mEdge::zero, mEdge::zero, e});
// }
// if (leastSignificantQubit == 0) {
// idTable[static_cast<std::size_t>(mostSignificantQubit)] = e;
// }
// return e;
// }
// create n-qubit identity DD. Equivalent to creating a terminal with weight 1.
mEdge makeIdent() {
return mEdge::terminal(cn.lookup(1));
}

// identity table access and reset
[[nodiscard]] const auto& getIdentityTable() const { return idTable; }
Expand Down
39 changes: 24 additions & 15 deletions test/test_package.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,22 +173,27 @@ TEST(DDPackageTest, NegativeControl) {
EXPECT_EQ(dd->getValueByPath(state01, 0b01).r, 1.);
}

//TEST(DDPackageTest, IdentityTrace) {
// auto dd = std::make_unique<dd::Package<>>(4);
// auto identity = dd->makeIdent(4);
// std::string filename1 = "C:/Users/aaron/OneDrive/Documents/GitHub/ddsim/extern/qfr/extern/dd_package/graphs/Identity";
// dd::export2Dot(identity, filename1);
// auto fullTrace = dd->trace(dd->makeIdent(4));
//
// ASSERT_EQ(fullTrace, (dd::ComplexValue{16, 0}));
//}
TEST(DDPackageTest, IdentityTrace) {
auto dd = std::make_unique<dd::Package<>>(4);
auto identity = dd->makeIdent();

//TEST(DDPackageTest, PartialIdentityTrace) {
// auto dd = std::make_unique<dd::Package<>>(2);
// auto tr = dd->partialTrace(dd->makeIdent(2), {false, true});
// auto mul = dd->multiply(tr, tr);
// EXPECT_EQ(dd::CTEntry::val(mul.w.r), 4.0);
//}
auto fullTrace = dd->trace(identity);

ASSERT_EQ(fullTrace, (dd::ComplexValue{16, 0}));
}

TEST(DDPackageTest, PartialIdentityTrace) {
auto dd = std::make_unique<dd::Package<>>(2);
auto tr = dd->partialTrace(dd->makeIdent(), {false, true});
std::string filename1 = "C:/Users/aaron/OneDrive/Documents/GitHub/ddsim/extern/qfr/extern/dd_package/graphs/Trace";
dd::export2Dot(tr, filename1);
auto mul = dd->multiply(tr, tr);
std::string filename2 = "C:/Users/aaron/OneDrive/Documents/GitHub/ddsim/extern/qfr/extern/dd_package/graphs/Multiply";
dd::export2Dot(mul, filename2);
dd::export2Dot(tr, filename1);

EXPECT_EQ(dd::CTEntry::val(mul.w.r), 4.0);
}

TEST(DDPackageTest, StateGenerationManipulation) {
const std::size_t nqubits = 6;
Expand All @@ -214,6 +219,8 @@ TEST(DDPackageTest, VectorSerializationTest) {
auto zeroState = dd->makeZeroState(2);

auto bellState = dd->multiply(dd->multiply(cxGate, hGate), zeroState);
std::string filename1 = "C:/Users/aaron/OneDrive/Documents/GitHub/ddsim/extern/qfr/extern/dd_package/graphs/BellState";
dd::export2Dot(bellState, filename1, true, true);

serialize(bellState, "bell_state.dd", false);
auto deserializedBellState = dd->deserialize<dd::vNode>("bell_state.dd", false);
Expand All @@ -232,6 +239,8 @@ TEST(DDPackageTest, BellMatrix) {

auto bellMatrix = dd->multiply(cxGate, hGate);

std::string filename1 = "C:/Users/aaron/OneDrive/Documents/GitHub/ddsim/extern/qfr/extern/dd_package/graphs/BellMatrix";
dd::export2Dot(bellMatrix, filename1, true, true);
ASSERT_EQ(dd->getValueByPath(bellMatrix, "00"), (dd::ComplexValue{dd::SQRT2_2, 0}));
ASSERT_EQ(dd->getValueByPath(bellMatrix, "02"), (dd::ComplexValue{0, 0}));
ASSERT_EQ(dd->getValueByPath(bellMatrix, "20"), (dd::ComplexValue{0, 0}));
Expand Down

0 comments on commit 9370f6d

Please sign in to comment.