1 files changed, 87 insertions, 199 deletions

diff --git a/Metrics/Metrics-Calculation/metrics_plot/src/metrics_distance_with_selector.ipynb b/Metrics/Metrics-Calculation/metrics_plot/src/metrics_distance_with_selector.ipynb
index 8c57a327..a0b0ad8d 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/src/metrics_distance_with_selector.ipynb
+++ b/Metrics/Metrics-Calculation/metrics_plot/src/metrics_distance_with_selector.ipynb
@@ -108,7 +108,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -184,7 +184,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -201,8 +201,7 @@
     "viatra_no_con_stats = readStats('../statistics/viatra_nocon_output/', 5000)\n",
     "viatra_con_stats = readStats('../statistics/viatra_con_output/',5000)\n",
     "random_stats = readStats('../statistics/random_output/',5000)\n",
-    "real_random_stats = readStats('../statistics/real_random_output/', 10000)\n",
-    "viatra_500_stats = readStats('../statistics/viatra500nodes/', 10000)"
+    "con_viatra_stats = readStats('../statistics/controled_viatra/',300)"
    ]
   },
   {
@@ -214,20 +213,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [],
    "source": [
     "viatra_no_con_dic = calDistanceDic(viatra_no_con_stats, human_rep)\n",
     "viatra_con_dic = calDistanceDic(viatra_con_stats, human_rep)\n",
     "random_dic = calDistanceDic(random_stats, human_rep)\n",
-    "real_random_dic = calDistanceDic(real_random_stats, human_rep)\n",
-    "viatra_500_dic = calDistanceDic(viatra_500_stats, human_rep)"
+    "con_viatra_dic = calDistanceDic(con_viatra_stats, human_rep)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -253,13 +251,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 31,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "cba63d8050a043018a16db6f1a0440f9",
+       "model_id": "868a437468d24144926f1390cbf2acb8",
        "version_major": 2,
        "version_minor": 0
       },
@@ -276,7 +274,7 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 31,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -289,18 +287,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 32,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "3c07dab0b6fd4c45b0168d206e99e4ea",
+       "model_id": "e8b74fe96a45445f8062468ddf2597bf",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(11,), options={'../statistics/viatra_no…"
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/viatra_noc…"
       ]
      },
      "metadata": {},
@@ -312,7 +310,7 @@
        "<function __main__.plot_out_na(lines)>"
       ]
      },
-     "execution_count": 32,
+     "execution_count": 13,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -325,18 +323,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 33,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "f3bb86160c964b5383bda7cdee81a1b7",
+       "model_id": "c6e7e31f454a48169dac12c8aac70eef",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(11,), options={'../statistics/viatra_no…"
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/viatra_noc…"
       ]
      },
      "metadata": {},
@@ -348,7 +346,7 @@
        "<function __main__.plot_out_mpc(lines)>"
       ]
      },
-     "execution_count": 33,
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -361,44 +359,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 35,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "filenames = reader.readmultiplefiles('../statistics/viatra_con_output/trajectories/', 15, False)\n",
-    "trajectories = {}\n",
-    "for name in filenames:\n",
-    "    trajectories[name] = reader.readTrajectory(name)\n",
-    "\n",
-    "w = widgets.SelectMultiple(\n",
-    "    options = trajectories,\n",
-    "    value = [trajectories[filenames[0]]],\n",
-    "    description='Trajectory:',\n",
-    "    disabled=False,\n",
-    ")\n",
-    "\n",
-    "#generate random color for each line\n",
-    "colors = []\n",
-    "\n",
-    "for i in range(0, len(trajectories)):\n",
-    "    color = \"#%06x\" % random.randint(0, 0xFFFFFF)\n",
-    "    colors.append(color)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 36,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "ec10c88d57f14461b160572e0a3f4e0d",
+       "model_id": "cebc359548f74cc8b7540ecc3876c9ee",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/viatra_con…"
+       "interactive(children=(Dropdown(description='lines', options=([],), value=[]), Output()), _dom_classes=('widget…"
       ]
      },
      "metadata": {},
@@ -410,7 +382,7 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 36,
+     "execution_count": 15,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -418,23 +390,23 @@
    "source": [
     "def plot_out_degree(lines):\n",
     "    plot(viatra_con_dic, lines, 0, lambda a: a.out_d_distance, colors, 'out degree')\n",
-    "interact(plot_out_degree, lines=w)"
+    "interact(plot_out_degree, lines=[[]])"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 37,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "bde0cb7466f64699be0159a8404eb821",
+       "model_id": "682beae42eef4676b11b6fe23127a44e",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(3,), options={'../statistics/viatra_con…"
+       "interactive(children=(Dropdown(description='lines', options=([],), value=[]), Output()), _dom_classes=('widget…"
       ]
      },
      "metadata": {},
@@ -446,7 +418,7 @@
        "<function __main__.plot_na(lines)>"
       ]
      },
-     "execution_count": 37,
+     "execution_count": 16,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -454,23 +426,23 @@
    "source": [
     "def plot_na(lines):\n",
     "    plot(viatra_con_dic, lines, 0, lambda a: a.na_distance, colors, 'node activity')\n",
-    "interact(plot_na, lines=w)"
+    "interact(plot_na, lines=[[]])"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 38,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "9fda08a154104d80aca9d6eef3404bf1",
+       "model_id": "6893b8c6e03441f89fc35bf784992ae9",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(3,), options={'../statistics/viatra_con…"
+       "interactive(children=(Dropdown(description='lines', options=([],), value=[]), Output()), _dom_classes=('widget…"
       ]
      },
      "metadata": {},
@@ -482,7 +454,7 @@
        "<function __main__.plot_mpc(lines)>"
       ]
      },
-     "execution_count": 38,
+     "execution_count": 17,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -490,18 +462,18 @@
    "source": [
     "def plot_mpc(lines):\n",
     "    plot(viatra_con_dic, lines, 0, lambda a: a.mpc_distance, colors, 'MPC')\n",
-    "interact(plot_mpc, lines=w)"
+    "interact(plot_mpc, lines=[[]])"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": 18,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "5f4859e7657a4080b8ee0db66ad70b04",
+       "model_id": "ff0e1991c69a4d77a40f57225f90295a",
        "version_major": 2,
        "version_minor": 0
       },
@@ -518,7 +490,7 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 29,
+     "execution_count": 18,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -531,49 +503,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 28,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "fd6387994c764904b20975a54b47bf3a",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "interactive(children=(Dropdown(description='lines', options=([],), value=[]), Output()), _dom_classes=('widget…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "text/plain": [
-       "<function __main__.plot_out_degree(lines)>"
-      ]
-     },
-     "execution_count": 28,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "def plot_out_degree(lines):\n",
-    "    plot(random_dic, lines, 0, lambda a: a.na_distance, colors, 'node activity')\n",
-    "interact(plot_out_degree, lines=[[]])"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 26,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "27e3897451694ffb8af3dd32bc0ece70",
+       "model_id": "838570f20bed4d8d9c618305984d19ef",
        "version_major": 2,
        "version_minor": 0
       },
@@ -590,26 +526,26 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 26,
+     "execution_count": 19,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
     "def plot_out_degree(lines):\n",
-    "    plot(random_dic, lines, 0, lambda a: a.mpc_distance, colors, 'MPC')\n",
+    "    plot(random_dic, lines, 0, lambda a: a.na_distance, colors, 'out degree')\n",
     "interact(plot_out_degree, lines=[[]])"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": 20,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "f4d0964368254b599c7cb8d6b6f9a0f4",
+       "model_id": "f4825f6257a74bce9dd22aac8a98effa",
        "version_major": 2,
        "version_minor": 0
       },
@@ -626,96 +562,41 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 25,
+     "execution_count": 20,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
     "def plot_out_degree(lines):\n",
-    "    plot(real_random_dic, lines, 0, lambda a: a.out_d_distance, colors, 'out degree')\n",
+    "    plot(random_dic, lines, 0, lambda a: a.mpc_distance, colors, 'out degree')\n",
     "interact(plot_out_degree, lines=[[]])"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": 54,
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "eca026dd74a945bcbebde5cb69cfe0e2",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "interactive(children=(Dropdown(description='lines', options=([],), value=[]), Output()), _dom_classes=('widget…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "text/plain": [
-       "<function __main__.plot_out_degree(lines)>"
-      ]
-     },
-     "execution_count": 24,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
-    "def plot_out_degree(lines):\n",
-    "    plot(real_random_dic, lines, 0, lambda a: a.na_distance, colors, 'node activity')\n",
-    "interact(plot_out_degree, lines=[[]])"
+    "con_viatra_stats = readStats('../statistics/controled_viatra/',5000)\n",
+    "con_viatra_dic = calDistanceDic(con_viatra_stats, human_rep)"
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 27,
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "eff1d3cd5d1a4a85b56024362890759c",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "interactive(children=(Dropdown(description='lines', options=([],), value=[]), Output()), _dom_classes=('widget…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "text/plain": [
-       "<function __main__.plot_out_degree(lines)>"
-      ]
-     },
-     "execution_count": 27,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
    "source": [
-    "def plot_out_degree(lines):\n",
-    "    plot(real_random_dic, lines, 0, lambda a: a.mpc_distance, colors, 'MPC')\n",
-    "interact(plot_out_degree, lines=[[]])"
+    "## Trajectories for controlled viatra solver"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 56,
    "metadata": {},
    "outputs": [],
    "source": [
-    "filenames = reader.readmultiplefiles('../statistics/viatra500nodes/trajectories/', 15, False)\n",
+    "filenames = reader.readmultiplefiles('../statistics/controled_viatra/trajectories/', 25, False)\n",
     "trajectories = {}\n",
     "for name in filenames:\n",
     "    trajectories[name] = reader.readTrajectory(name)\n",
@@ -725,30 +606,23 @@
     "    value = [trajectories[filenames[0]]],\n",
     "    description='Trajectory:',\n",
     "    disabled=False,\n",
-    ")\n",
-    "\n",
-    "#generate random color for each line\n",
-    "colors = []\n",
-    "\n",
-    "for i in range(0, len(trajectories)):\n",
-    "    color = \"#%06x\" % random.randint(0, 0xFFFFFF)\n",
-    "    colors.append(color)"
+    ")"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 57,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "e281415e80684a85ba24ab8cb48ea3fe",
+       "model_id": "4b60ae3859e343299badf29272f67d21",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/viatra500n…"
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/controled_…"
       ]
      },
      "metadata": {},
@@ -760,31 +634,31 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 12,
+     "execution_count": 57,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
     "def plot_out_degree(lines):\n",
-    "    plot(viatra_500_dic, lines, 0, lambda a: a.na_distance, colors, 'node activity')\n",
+    "    plot(con_viatra_dic, lines, 0, lambda a: a.out_d_distance, colors, 'out_degree')\n",
     "interact(plot_out_degree, lines=w)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 58,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "d678fee844e84e2785d50945288f833d",
+       "model_id": "8e7965d793a146d4bbc268554262eb58",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/viatra500n…"
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/controled_…"
       ]
      },
      "metadata": {},
@@ -793,34 +667,34 @@
     {
      "data": {
       "text/plain": [
-       "<function __main__.plot_out_degree(lines)>"
+       "<function __main__.plot_na(lines)>"
       ]
      },
-     "execution_count": 22,
+     "execution_count": 58,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "def plot_out_degree(lines):\n",
-    "    plot(viatra_500_dic, lines, 0, lambda a: a.out_d_distance, colors, 'out degree')\n",
-    "interact(plot_out_degree, lines=w)"
+    "def plot_na(lines):\n",
+    "    plot(con_viatra_dic, lines, 0, lambda a: a.na_distance, colors, 'Node Activity')\n",
+    "interact(plot_na, lines=w)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 59,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "55ca7c3f89224cce8d3a87cf23b20f92",
+       "model_id": "55a1209d0b924a39b4729228e81ee3ab",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/viatra500n…"
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/controled_…"
       ]
      },
      "metadata": {},
@@ -829,18 +703,18 @@
     {
      "data": {
       "text/plain": [
-       "<function __main__.plot_out_degree(lines)>"
+       "<function __main__.plot_mpc(lines)>"
       ]
      },
-     "execution_count": 21,
+     "execution_count": 59,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "def plot_out_degree(lines):\n",
-    "    plot(viatra_500_dic, lines, 0, lambda a: a.mpc_distance, colors, 'mpc')\n",
-    "interact(plot_out_degree, lines=w)"
+    "def plot_mpc(lines):\n",
+    "    plot(con_viatra_dic, lines, 0, lambda a: a.mpc_distance, colors, 'mpc')\n",
+    "interact(plot_mpc, lines=w)"
    ]
   },
   {
@@ -849,6 +723,20 @@
    "metadata": {},
    "outputs": [],
    "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {