Merge pull request #156 from shenzhi-git/master

wangjing
OriginQ · Jul 31, 2021 · b4aca06 · b4aca06
2 parents eca6860 + 2281f07
commit b4aca06
Show file tree

Hide file tree

Showing 14 changed files with 2,326 additions and 1,408 deletions.
diff --git a/Core/Core.cpp b/Core/Core.cpp
@@ -431,20 +431,7 @@ map<string, size_t> QPanda::quickMeasure(QVec vQubit, int shots)
     return temp->quickMeasure(vQubit, shots);
 }
 
-QProg QPanda::MeasureAll(QVec vQubit, vector<ClassicalCondition> vCBit)
-{
-    QProg qprog = CreateEmptyQProg();
-    if (vQubit.size() != vCBit.size())
-    {
-        QCERR("vQubit != vCBit");
-        throw invalid_argument("vQubit != vCBit");
-    }
-    for (size_t i = 0; i < vQubit.size(); i++)
-    {
-        qprog << Measure(vQubit[i], vCBit[i]);
-    }
-    return qprog;
-}
+
 
 QStat QPanda::getQState()
 {