diff --git a/Analysis/0411_unp-left_p-right-uturn/0417_generate_signals.ipynb b/Analysis/0411_unp-left_p-right-uturn/0417_generate_signals.ipynb index d200d3e3f..37dbc02ef 100644 --- a/Analysis/0411_unp-left_p-right-uturn/0417_generate_signals.ipynb +++ b/Analysis/0411_unp-left_p-right-uturn/0417_generate_signals.ipynb @@ -18,7 +18,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 34, "metadata": {}, "outputs": [ { @@ -40,33 +40,34 @@ "self.process_history() # 2\n", "self.process_movement() # 3\n", "self.make_histids() # 4\n", - "self.set_timepoints()" + "self.set_timepoints() # 5-1\n", + "self.assign_red_yellow() # 5-2" ] }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 19, "metadata": {}, "outputs": [ { - "ename": "AttributeError", - "evalue": "'SignalGenerator' object has no attribute 'ids'", - "output_type": "error", - "traceback": [ - "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[1;31mAttributeError\u001b[0m Traceback (most recent call last)", - "Cell \u001b[1;32mIn[14], line 1\u001b[0m\n\u001b[1;32m----> 1\u001b[0m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mids\u001b[49m\n", - "\u001b[1;31mAttributeError\u001b[0m: 'SignalGenerator' object has no attribute 'ids'" + "name": "stdout", + "output_type": "stream", + "text": [ + "['i0', 'i1', 'i2', 'i3', 'i6', 'i7', 'i8', 'i9']\n", + "['u00', 'u20', 'u30', 'u31', 'u32', 'u60']\n", + "['c30']\n" ] } ], "source": [ - "self.ids" + "print(self.parent_ids)\n", + "print(self.uturn_ids)\n", + "print(self.coord_ids)" ] }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 37, "metadata": {}, "outputs": [ { @@ -90,212 +91,373 @@ " \n", " \n", " \n", - " inter_no\n", " node_id\n", " start_unix\n", - " phas_A\n", - " phas_B\n", - " move_A\n", - " move_B\n", + " phase\n", " duration\n", - " state_A\n", - " state_B\n", + " state\n", " \n", " \n", " \n", " \n", " 0\n", - " 175\n", " i0\n", - " 1704415810\n", - " 1\n", - " 1\n", - " 8\n", - " 4\n", - " 43\n", - " grrrgrrrgGGGGrgrr\n", - " gGGrgrrrgrrrrrgrr\n", + " 1704418150\n", + " 1g_1g\n", + " 39\n", + " gGGrgrrrgGGGGrgrr\n", " \n", " \n", " 1\n", - " 175\n", " i0\n", - " 1704415810\n", - " 2\n", - " 2\n", - " 7\n", - " 3\n", - " 45\n", - " grrGgrrrgrrrrrgrr\n", - " grrrgrrrgrrrrGgrr\n", + " 1704418150\n", + " 1y_1y\n", + " 4\n", + " gyyrgrrrgyyyyrgrr\n", " \n", " \n", " 2\n", - " 175\n", " i0\n", - " 1704415810\n", - " 3\n", - " 3\n", - " 6\n", + " 1704418150\n", + " 2r_2r\n", " 1\n", - " 33\n", - " grrrgGGrgrrrrrgrr\n", - " grrrgrrGgrrrrrgrr\n", + " grrrgrrrgrrrrrgrr\n", " \n", " \n", " 3\n", - " 175\n", " i0\n", - " 1704415810\n", - " 3\n", + " 1704418150\n", + " 2g_2g\n", + " 40\n", + " grrGgrrrgrrrrGgrr\n", + " \n", + " \n", + " 4\n", + " i0\n", + " 1704418150\n", + " 2y_2y\n", " 4\n", - " 6\n", - " 2\n", - " 22\n", + " grrygrrrgrrrrygrr\n", + " \n", + " \n", + " 5\n", + " i0\n", + " 1704418150\n", + " 3r_3r\n", + " 1\n", " grrrgGGrgrrrrrgrr\n", - " grrrgrrrgrrrrrgGr\n", " \n", " \n", - " 4\n", - " 175\n", + " 6\n", + " i0\n", + " 1704418150\n", + " 3g_3g\n", + " 28\n", + " grrrgGGGgrrrrrgrr\n", + " \n", + " \n", + " 7\n", " i0\n", - " 1704415810\n", + " 1704418150\n", + " 3g_3y\n", " 4\n", + " grrrgGGygrrrrrgrr\n", + " \n", + " \n", + " 8\n", + " i0\n", + " 1704418150\n", + " 3g_4r\n", + " 1\n", + " grrrgGGrgrrrrrgGr\n", + " \n", + " \n", + " 9\n", + " i0\n", + " 1704418150\n", + " 3g_4g\n", + " 17\n", + " grrrgGGrgrrrrrgGr\n", + " \n", + " \n", + " 10\n", + " i0\n", + " 1704418150\n", + " 3y_4g\n", " 4\n", - " 5\n", - " 2\n", - " 37\n", - " grrrgrrrgrrrrrgrG\n", + " grrrgyyrgrrrrrgGr\n", + " \n", + " \n", + " 11\n", + " i0\n", + " 1704418150\n", + " 4r_4g\n", + " 1\n", " grrrgrrrgrrrrrgGr\n", " \n", " \n", - " ...\n", - " ...\n", - " ...\n", - " ...\n", - " ...\n", - " ...\n", - " ...\n", - " ...\n", - " ...\n", - " ...\n", - " ...\n", + " 12\n", + " i0\n", + " 1704418150\n", + " 4g_4g\n", + " 32\n", + " grrrgrrrgrrrrrgGG\n", + " \n", + " \n", + " 13\n", + " i0\n", + " 1704418150\n", + " 4y_4y\n", + " 4\n", + " grrrgrrrgrrrrrgyy\n", " \n", " \n", - " 387\n", - " 210\n", - " u60\n", - " 1704416820\n", + " 14\n", + " i0\n", + " 1704418330\n", + " 1r_1r\n", " 1\n", + " grrrgrrrgrrrrrgrr\n", + " \n", + " \n", + " 15\n", + " i0\n", + " 1704418330\n", + " 1g_1g\n", + " 38\n", + " gGGrgrrrgGGGGrgrr\n", + " \n", + " \n", + " 16\n", + " i0\n", + " 1704418330\n", + " 1y_1y\n", + " 4\n", + " gyyrgrrrgyyyyrgrr\n", + " \n", + " \n", + " 17\n", + " i0\n", + " 1704418330\n", + " 2r_2r\n", " 1\n", - " 6\n", - " 18\n", - " 25\n", - " GGGGGGGGr\n", - " GGGGGGGGr\n", + " grrrgrrrgrrrrrgrr\n", + " \n", + " \n", + " 18\n", + " i0\n", + " 1704418330\n", + " 2g_2g\n", + " 40\n", + " grrGgrrrgrrrrGgrr\n", " \n", " \n", - " 388\n", - " 210\n", - " u60\n", - " 1704416820\n", + " 19\n", + " i0\n", + " 1704418330\n", + " 2y_2y\n", + " 4\n", + " grrygrrrgrrrrygrr\n", + " \n", + " \n", + " 20\n", + " i0\n", + " 1704418330\n", + " 3r_3r\n", " 1\n", - " 2\n", - " 6\n", - " 2\n", - " 13\n", - " GGGGGGGGr\n", - " GGGGGGGGr\n", - " \n", - " \n", - " 389\n", - " 210\n", - " u60\n", - " 1704416820\n", - " 2\n", - " 2\n", - " 5\n", - " 2\n", - " 38\n", - " GGGGGGGGG\n", - " GGGGGGGGr\n", + " grrrgGGrgrrrrrgrr\n", + " \n", + " \n", + " 21\n", + " i0\n", + " 1704418330\n", + " 3g_3g\n", + " 28\n", + " grrrgGGGgrrrrrgrr\n", + " \n", + " \n", + " 22\n", + " i0\n", + " 1704418330\n", + " 3g_3y\n", + " 4\n", + " grrrgGGygrrrrrgrr\n", + " \n", + " \n", + " 23\n", + " i0\n", + " 1704418330\n", + " 3g_4r\n", + " 1\n", + " grrrgGGrgrrrrrgGr\n", + " \n", + " \n", + " 24\n", + " i0\n", + " 1704418330\n", + " 3g_4g\n", + " 17\n", + " grrrgGGrgrrrrrgGr\n", + " \n", + " \n", + " 25\n", + " i0\n", + " 1704418330\n", + " 3y_4g\n", + " 4\n", + " grrrgyyrgrrrrrgGr\n", + " \n", + " \n", + " 26\n", + " i0\n", + " 1704418330\n", + " 4r_4g\n", + " 1\n", + " grrrgrrrgrrrrrgGr\n", + " \n", + " \n", + " 27\n", + " i0\n", + " 1704418330\n", + " 4g_4g\n", + " 32\n", + " grrrgrrrgrrrrrgGG\n", " \n", " \n", - " 390\n", - " 210\n", - " u60\n", - " 1704416820\n", - " 3\n", - " 3\n", - " 7\n", + " 28\n", + " i0\n", + " 1704418330\n", + " 4y_4y\n", " 4\n", - " 62\n", - " GGGGGGGGr\n", - " GGGGGGGGr\n", + " grrrgrrrgrrrrrgyy\n", + " \n", + " \n", + " 29\n", + " i0\n", + " 1704418510\n", + " 1r_1r\n", + " 1\n", + " grrrgrrrgrrrrrgrr\n", + " \n", + " \n", + " 30\n", + " i0\n", + " 1704418510\n", + " 1g_1g\n", + " 38\n", + " gGGrgrrrgGGGGrgrr\n", " \n", " \n", - " 391\n", - " 210\n", - " u60\n", - " 1704416820\n", + " 31\n", + " i0\n", + " 1704418510\n", + " 1y_1y\n", " 4\n", + " gyyrgrrrgyyyyrgrr\n", + " \n", + " \n", + " 32\n", + " i0\n", + " 1704418510\n", + " 2r_2r\n", + " 1\n", + " grrrgrrrgrrrrrgrr\n", + " \n", + " \n", + " 33\n", + " i0\n", + " 1704418510\n", + " 2g_2g\n", + " 40\n", + " grrGgrrrgrrrrGgrr\n", + " \n", + " \n", + " 34\n", + " i0\n", + " 1704418510\n", + " 2y_2y\n", " 4\n", - " 8\n", - " 3\n", - " 21\n", - " GGGGGGGGr\n", - " GGGGGGGGr\n", + " grrygrrrgrrrrygrr\n", + " \n", + " \n", + " 35\n", + " i0\n", + " 1704418510\n", + " 3r_3r\n", + " 1\n", + " grrrgGGrgrrrrrgrr\n", + " \n", + " \n", + " 36\n", + " i0\n", + " 1704418510\n", + " 3g_3g\n", + " 28\n", + " grrrgGGGgrrrrrgrr\n", + " \n", + " \n", + " 37\n", + " i0\n", + " 1704418510\n", + " 3g_3y\n", + " 22\n", + " grrrgGGygrrrrrgrr\n", " \n", " \n", "\n", - "

392 rows × 10 columns

\n", "" ], "text/plain": [ - " inter_no node_id start_unix phas_A phas_B move_A move_B duration \\\n", - "0 175 i0 1704415810 1 1 8 4 43 \n", - "1 175 i0 1704415810 2 2 7 3 45 \n", - "2 175 i0 1704415810 3 3 6 1 33 \n", - "3 175 i0 1704415810 3 4 6 2 22 \n", - "4 175 i0 1704415810 4 4 5 2 37 \n", - ".. ... ... ... ... ... ... ... ... \n", - "387 210 u60 1704416820 1 1 6 18 25 \n", - "388 210 u60 1704416820 1 2 6 2 13 \n", - "389 210 u60 1704416820 2 2 5 2 38 \n", - "390 210 u60 1704416820 3 3 7 4 62 \n", - "391 210 u60 1704416820 4 4 8 3 21 \n", - "\n", - " state_A state_B \n", - "0 grrrgrrrgGGGGrgrr gGGrgrrrgrrrrrgrr \n", - "1 grrGgrrrgrrrrrgrr grrrgrrrgrrrrGgrr \n", - "2 grrrgGGrgrrrrrgrr grrrgrrGgrrrrrgrr \n", - "3 grrrgGGrgrrrrrgrr grrrgrrrgrrrrrgGr \n", - "4 grrrgrrrgrrrrrgrG grrrgrrrgrrrrrgGr \n", - ".. ... ... \n", - "387 GGGGGGGGr GGGGGGGGr \n", - "388 GGGGGGGGr GGGGGGGGr \n", - "389 GGGGGGGGG GGGGGGGGr \n", - "390 GGGGGGGGr GGGGGGGGr \n", - "391 GGGGGGGGr GGGGGGGGr \n", - "\n", - "[392 rows x 10 columns]" + " node_id start_unix phase duration state\n", + "0 i0 1704418150 1g_1g 39 gGGrgrrrgGGGGrgrr\n", + "1 i0 1704418150 1y_1y 4 gyyrgrrrgyyyyrgrr\n", + "2 i0 1704418150 2r_2r 1 grrrgrrrgrrrrrgrr\n", + "3 i0 1704418150 2g_2g 40 grrGgrrrgrrrrGgrr\n", + "4 i0 1704418150 2y_2y 4 grrygrrrgrrrrygrr\n", + "5 i0 1704418150 3r_3r 1 grrrgGGrgrrrrrgrr\n", + "6 i0 1704418150 3g_3g 28 grrrgGGGgrrrrrgrr\n", + "7 i0 1704418150 3g_3y 4 grrrgGGygrrrrrgrr\n", + "8 i0 1704418150 3g_4r 1 grrrgGGrgrrrrrgGr\n", + "9 i0 1704418150 3g_4g 17 grrrgGGrgrrrrrgGr\n", + "10 i0 1704418150 3y_4g 4 grrrgyyrgrrrrrgGr\n", + "11 i0 1704418150 4r_4g 1 grrrgrrrgrrrrrgGr\n", + "12 i0 1704418150 4g_4g 32 grrrgrrrgrrrrrgGG\n", + "13 i0 1704418150 4y_4y 4 grrrgrrrgrrrrrgyy\n", + "14 i0 1704418330 1r_1r 1 grrrgrrrgrrrrrgrr\n", + "15 i0 1704418330 1g_1g 38 gGGrgrrrgGGGGrgrr\n", + "16 i0 1704418330 1y_1y 4 gyyrgrrrgyyyyrgrr\n", + "17 i0 1704418330 2r_2r 1 grrrgrrrgrrrrrgrr\n", + "18 i0 1704418330 2g_2g 40 grrGgrrrgrrrrGgrr\n", + "19 i0 1704418330 2y_2y 4 grrygrrrgrrrrygrr\n", + "20 i0 1704418330 3r_3r 1 grrrgGGrgrrrrrgrr\n", + "21 i0 1704418330 3g_3g 28 grrrgGGGgrrrrrgrr\n", + "22 i0 1704418330 3g_3y 4 grrrgGGygrrrrrgrr\n", + "23 i0 1704418330 3g_4r 1 grrrgGGrgrrrrrgGr\n", + "24 i0 1704418330 3g_4g 17 grrrgGGrgrrrrrgGr\n", + "25 i0 1704418330 3y_4g 4 grrrgyyrgrrrrrgGr\n", + "26 i0 1704418330 4r_4g 1 grrrgrrrgrrrrrgGr\n", + "27 i0 1704418330 4g_4g 32 grrrgrrrgrrrrrgGG\n", + "28 i0 1704418330 4y_4y 4 grrrgrrrgrrrrrgyy\n", + "29 i0 1704418510 1r_1r 1 grrrgrrrgrrrrrgrr\n", + "30 i0 1704418510 1g_1g 38 gGGrgrrrgGGGGrgrr\n", + "31 i0 1704418510 1y_1y 4 gyyrgrrrgyyyyrgrr\n", + "32 i0 1704418510 2r_2r 1 grrrgrrrgrrrrrgrr\n", + "33 i0 1704418510 2g_2g 40 grrGgrrrgrrrrGgrr\n", + "34 i0 1704418510 2y_2y 4 grrygrrrgrrrrygrr\n", + "35 i0 1704418510 3r_3r 1 grrrgGGrgrrrrrgrr\n", + "36 i0 1704418510 3g_3g 28 grrrgGGGgrrrrrgrr\n", + "37 i0 1704418510 3g_3y 22 grrrgGGygrrrrrgrr" ] }, - "execution_count": 10, + "execution_count": 37, "metadata": {}, "output_type": "execute_result" } ], "source": [ - "self.histids" + "node_id = self.parent_ids[0]\n", + "self.SIGTABLE[self.SIGTABLE.node_id==node_id]" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": { diff --git a/Scripts/__pycache__/generate_signals.cpython-38.pyc b/Scripts/__pycache__/generate_signals.cpython-38.pyc index 566e14de0..8820c1c56 100644 Binary files a/Scripts/__pycache__/generate_signals.cpython-38.pyc and b/Scripts/__pycache__/generate_signals.cpython-38.pyc differ diff --git a/Scripts/__pycache__/preprocess_daily.cpython-38.pyc b/Scripts/__pycache__/preprocess_daily.cpython-38.pyc index bdfb2a49d..0e0ac99dc 100644 Binary files a/Scripts/__pycache__/preprocess_daily.cpython-38.pyc and b/Scripts/__pycache__/preprocess_daily.cpython-38.pyc differ