diff --git a/Analysis/0307_red_yellow/0307_red_yellow_2.ipynb b/Analysis/0307_red_yellow/0307_red_yellow_2.ipynb
index 186b07f51..d8e0c3d1c 100644
--- a/Analysis/0307_red_yellow/0307_red_yellow_2.ipynb
+++ b/Analysis/0307_red_yellow/0307_red_yellow_2.ipynb
@@ -275,7 +275,7 @@
"self.make_histids()\n",
"self.set_timepoints()\n",
"self.assign_red_yellow()\n",
- "self.self.self.self.self.self.self.self.self.self.self.self.self.self.SIGTABLETABLETABLETABLETABLETABLETABLETABLETABLETABLETABLETABLETABLETABLE"
+ "self.SIGTABLE"
]
},
{
@@ -1205,7 +1205,7 @@
},
{
"cell_type": "code",
- "execution_count": 39,
+ "execution_count": 73,
"metadata": {},
"outputs": [],
"source": [
@@ -1302,154 +1302,20 @@
},
{
"cell_type": "code",
- "execution_count": 65,
+ "execution_count": 80,
"metadata": {},
"outputs": [
{
- "data": {
- "text/html": [
- "
\n",
- "\n",
- "
\n",
- " \n",
- " \n",
- " | \n",
- " node_id | \n",
- " start_unix | \n",
- " phase | \n",
- " duration | \n",
- " state | \n",
- "
\n",
- " \n",
- " \n",
- " \n",
- " 0 | \n",
- " c30 | \n",
- " 1704418699 | \n",
- " 1g_1g | \n",
- " 39 | \n",
- " gGGrgrrrgGGGGrgrr | \n",
- "
\n",
- " \n",
- " 1 | \n",
- " c30 | \n",
- " 1704418699 | \n",
- " 1y_1y | \n",
- " 4 | \n",
- " gyyrgrrrgyyyyrgrr | \n",
- "
\n",
- " \n",
- " 2 | \n",
- " c30 | \n",
- " 1704418699 | \n",
- " 2r_2r | \n",
- " 1 | \n",
- " grrrgrrrgrrrrrgrr | \n",
- "
\n",
- " \n",
- " 3 | \n",
- " c30 | \n",
- " 1704418699 | \n",
- " 2g_2g | \n",
- " 40 | \n",
- " grrGgrrrgrrrrGgrr | \n",
- "
\n",
- " \n",
- " 4 | \n",
- " c30 | \n",
- " 1704418699 | \n",
- " 2y_2y | \n",
- " 4 | \n",
- " grrygrrrgrrrrygrr | \n",
- "
\n",
- " \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- "
\n",
- " \n",
- " 33 | \n",
- " u60 | \n",
- " 1704419060 | \n",
- " 2g_2g | \n",
- " 40 | \n",
- " grrGgrrrgrrrrGgrr | \n",
- "
\n",
- " \n",
- " 34 | \n",
- " u60 | \n",
- " 1704419060 | \n",
- " 2y_2y | \n",
- " 4 | \n",
- " grrygrrrgrrrrygrr | \n",
- "
\n",
- " \n",
- " 35 | \n",
- " u60 | \n",
- " 1704419060 | \n",
- " 3r_3r | \n",
- " 1 | \n",
- " grrrgGGrgrrrrrgrr | \n",
- "
\n",
- " \n",
- " 36 | \n",
- " u60 | \n",
- " 1704419060 | \n",
- " 3g_3g | \n",
- " 28 | \n",
- " grrrgGGGgrrrrrgrr | \n",
- "
\n",
- " \n",
- " 37 | \n",
- " u60 | \n",
- " 1704419060 | \n",
- " 3g_3y | \n",
- " 22 | \n",
- " grrrgGGygrrrrrgrr | \n",
- "
\n",
- " \n",
- "
\n",
- "
570 rows × 5 columns
\n",
- "
"
- ],
- "text/plain": [
- " node_id start_unix phase duration state\n",
- "0 c30 1704418699 1g_1g 39 gGGrgrrrgGGGGrgrr\n",
- "1 c30 1704418699 1y_1y 4 gyyrgrrrgyyyyrgrr\n",
- "2 c30 1704418699 2r_2r 1 grrrgrrrgrrrrrgrr\n",
- "3 c30 1704418699 2g_2g 40 grrGgrrrgrrrrGgrr\n",
- "4 c30 1704418699 2y_2y 4 grrygrrrgrrrrygrr\n",
- ".. ... ... ... ... ...\n",
- "33 u60 1704419060 2g_2g 40 grrGgrrrgrrrrGgrr\n",
- "34 u60 1704419060 2y_2y 4 grrygrrrgrrrrygrr\n",
- "35 u60 1704419060 3r_3r 1 grrrgGGrgrrrrrgrr\n",
- "36 u60 1704419060 3g_3g 28 grrrgGGGgrrrrrgrr\n",
- "37 u60 1704419060 3g_3y 22 grrrgGGygrrrrrgrr\n",
- "\n",
- "[570 rows x 5 columns]"
- ]
- },
- "execution_count": 65,
- "metadata": {},
- "output_type": "execute_result"
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "0.6265964508056641\n"
+ ]
}
],
"source": [
+ "import time\n",
+ "now = time.time()\n",
"self.SIGTABLE = []\n",
"for node_id in self.sigtable.node_id.unique():\n",
" sig = self.sigtable.query('node_id==@Node_id')\n",
@@ -1499,7 +1365,8 @@
" SIG = SIG.drop(columns=['start_time', 'state_A', 'state_B'])\n",
" self.SIGTABLE.append(SIG)\n",
"self.SIGTABLE = pd.concat(self.SIGTABLE)\n",
- "self.SIGTABLE"
+ "self.SIGTABLE\n",
+ "print(time.time() - now)"
]
}
],
diff --git a/Results/sn_1704417900.add.xml b/Results/sn_1704417900.add.xml
index 7cd98e966..3a63eb65f 100644
--- a/Results/sn_1704417900.add.xml
+++ b/Results/sn_1704417900.add.xml
@@ -1,8 +1,8 @@
-
-
-
+
+
+
@@ -10,11 +10,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -22,11 +22,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -34,11 +34,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -49,240 +49,240 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -333,64 +333,64 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,52 +462,52 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/Results/sn_1704418200.add.xml b/Results/sn_1704418200.add.xml
new file mode 100644
index 000000000..fc537fa91
--- /dev/null
+++ b/Results/sn_1704418200.add.xml
@@ -0,0 +1,716 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Results/sn_1704418800.add.xml b/Results/sn_1704418800.add.xml
index 38b0287d7..59b054394 100644
--- a/Results/sn_1704418800.add.xml
+++ b/Results/sn_1704418800.add.xml
@@ -1,8 +1,8 @@
-
-
-
+
+
+
@@ -10,11 +10,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -22,11 +22,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -34,11 +34,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -129,52 +129,52 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,52 +462,52 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/Scripts/__pycache__/generate_signals.cpython-38.pyc b/Scripts/__pycache__/generate_signals.cpython-38.pyc
index 2ba44d8bb..bd7cb230e 100644
Binary files a/Scripts/__pycache__/generate_signals.cpython-38.pyc and b/Scripts/__pycache__/generate_signals.cpython-38.pyc differ