--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.issues/8aa25bcae639fc99 Fri Apr 04 16:17:28 2008 -0400
@@ -0,0 +1,29 @@
+From artemis Fri Apr 4 15:18:37 2008
+From: Dmitriy Morozov <morozov@cs.duke.edu>
+Date: Fri, 04 Apr 2008 11:18:00
+State: fixed
+Subject: Switch in the pairing in Case 1.2
+Message-Id: <8aa25bcae639fc99-0-artemis@moscow>
+
+If simplex i is unpaired in Case 1.2, while i+1 is paired with l, and R[i,l]=1
+there is a switch in the pairing in Case 1.2.
+
+From artemis Fri Apr 4 20:17:02 2008
+From: Dmitriy Morozov <morozov@cs.duke.edu>
+Date: Fri, 04 Apr 2008 16:16:41
+Subject: Handled but mislabeled
+Message-Id: <8aa25bcae639fc99-bbca170318887f06-artemis@moscow>
+References: <8aa25bcae639fc99-0-artemis@moscow>
+In-Reply-To: <8aa25bcae639fc99-0-artemis@moscow>
+
+The situation is already handled in the code, but was mislabeled as Case 1.1.2
+
+From artemis Fri Apr 4 20:17:10 2008
+From: Dmitriy Morozov <morozov@cs.duke.edu>
+Date: Fri, 04 Apr 2008 16:17:10
+Subject: properties changes (state)
+Message-Id: <8aa25bcae639fc99-a4a82c4ab8c0f536-artemis@moscow>
+References: <8aa25bcae639fc99-0-artemis@moscow>
+In-Reply-To: <8aa25bcae639fc99-0-artemis@moscow>
+
+state=fixed
--- a/examples/triangle/triangle.cpp Wed Mar 26 05:53:03 2008 -0400
+++ b/examples/triangle/triangle.cpp Fri Apr 04 16:17:28 2008 -0400
@@ -33,7 +33,7 @@
stdoutLog.subscribeTo(RLOG_CHANNEL("topology/filtration"));
//stdoutLog.subscribeTo(RLOG_CHANNEL("topology/cycle"));
- stdoutLog.subscribeTo(RLOG_CHANNEL("topology/vineyard"));
+ //stdoutLog.subscribeTo(RLOG_CHANNEL("topology/vineyard"));
#endif
Evaluator<Simplex> e;
@@ -49,6 +49,12 @@
std::cout << tf << std::endl;
#if 1
+ Simplex A; A.add(0);
+ std::cout << A << std::endl;
+ std::cout << *tf.get_index(A) << std::endl;
+ std::cout << "Transposing A: " << tf.transpose(tf.get_index(A)) << std::endl;
+ std::cout << tf;
+
Simplex BC; BC.add(1); BC.add(2);
Simplex AB; AB.add(0); AB.add(1);
std::cout << BC << std::endl;
--- a/include/topology/filtration.hpp Wed Mar 26 05:53:03 2008 -0400
+++ b/include/topology/filtration.hpp Fri Apr 04 16:17:28 2008 -0400
@@ -25,6 +25,7 @@
static Counter* cFiltrationTransposition = GetCounter("filtration/transposition");
static Counter* cFiltrationTranspositionDiffDim = GetCounter("filtration/transposition/diffdim");
static Counter* cFiltrationTranspositionCase12 = GetCounter("filtration/transposition/case/1/2");
+static Counter* cFiltrationTranspositionCase12s = GetCounter("filtration/transposition/case/1/2/special");
static Counter* cFiltrationTranspositionCase112 = GetCounter("filtration/transposition/case/1/1/2");
static Counter* cFiltrationTranspositionCase111 = GetCounter("filtration/transposition/case/1/1/1");
static Counter* cFiltrationTranspositionCase22 = GetCounter("filtration/transposition/case/2/2");
@@ -250,12 +251,12 @@
return false;
} else
{
- // Case 1.1.2 --- special version (plain swap, but pairing switches)
+ // Case 1.2 --- special version (plain swap, but pairing switches)
swap(i_prev, i);
pairing_switch(i_prev, i);
- rLog(rlFiltrationTranspositions, "Case 1.1.2 --- unpaired");
+ rLog(rlFiltrationTranspositions, "Case 1.2 --- unpaired (pairing switch)");
rLog(rlFiltrationTranspositions, tostring(*i_prev).c_str());
- Count(cFiltrationTranspositionCase112);
+ Count(cFiltrationTranspositionCase12s);
return true;
}
}