1 files changed, 182 insertions, 22 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 e5868da0..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
@@ -16,7 +16,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -48,7 +48,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -78,7 +78,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -108,7 +108,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -139,7 +139,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -149,7 +149,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -163,7 +163,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -200,7 +200,8 @@
     "# Read generated models\n",
     "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)"
+    "random_stats = readStats('../statistics/random_output/',5000)\n",
+    "con_viatra_stats = readStats('../statistics/controled_viatra/',300)"
    ]
   },
   {
@@ -218,7 +219,8 @@
    "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)"
+    "random_dic = calDistanceDic(random_stats, human_rep)\n",
+    "con_viatra_dic = calDistanceDic(con_viatra_stats, human_rep)"
    ]
   },
   {
@@ -255,7 +257,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "1bdc31418d894783b36cc79c60251f00",
+       "model_id": "868a437468d24144926f1390cbf2acb8",
        "version_major": 2,
        "version_minor": 0
       },
@@ -291,7 +293,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "78565a0ec3d740908fcea753387cfc3e",
+       "model_id": "e8b74fe96a45445f8062468ddf2597bf",
        "version_major": 2,
        "version_minor": 0
       },
@@ -327,7 +329,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "4392eb19fe1844c4affeb62f9ba9163b",
+       "model_id": "c6e7e31f454a48169dac12c8aac70eef",
        "version_major": 2,
        "version_minor": 0
       },
@@ -363,7 +365,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "c667f0f9dcd5494f81d95c64ad900612",
+       "model_id": "cebc359548f74cc8b7540ecc3876c9ee",
        "version_major": 2,
        "version_minor": 0
       },
@@ -399,7 +401,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "991d8d2bfc644c82a9b079615900dc4d",
+       "model_id": "682beae42eef4676b11b6fe23127a44e",
        "version_major": 2,
        "version_minor": 0
       },
@@ -435,7 +437,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "be65f39c2fae4c84a1d6908f3b70a86e",
+       "model_id": "6893b8c6e03441f89fc35bf784992ae9",
        "version_major": 2,
        "version_minor": 0
       },
@@ -471,7 +473,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "1de0db5b5c8d46de958f6b43144dac54",
+       "model_id": "ff0e1991c69a4d77a40f57225f90295a",
        "version_major": 2,
        "version_minor": 0
       },
@@ -501,13 +503,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "6f8fa855125b4beca603abbf801412ac",
+       "model_id": "838570f20bed4d8d9c618305984d19ef",
        "version_major": 2,
        "version_minor": 0
       },
@@ -524,7 +526,7 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 20,
+     "execution_count": 19,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -537,13 +539,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 23,
+   "execution_count": 20,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "b4ed2adb29004908a3799bc91bf0662b",
+       "model_id": "f4825f6257a74bce9dd22aac8a98effa",
        "version_major": 2,
        "version_minor": 0
       },
@@ -560,7 +562,7 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 23,
+     "execution_count": 20,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -573,6 +575,164 @@
   },
   {
    "cell_type": "code",
+   "execution_count": 54,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "con_viatra_stats = readStats('../statistics/controled_viatra/',5000)\n",
+    "con_viatra_dic = calDistanceDic(con_viatra_stats, human_rep)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Trajectories for controlled viatra solver"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 56,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "filenames = reader.readmultiplefiles('../statistics/controled_viatra/trajectories/', 25, 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",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 57,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "4b60ae3859e343299badf29272f67d21",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/controled_…"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/plain": [
+       "<function __main__.plot_out_degree(lines)>"
+      ]
+     },
+     "execution_count": 57,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "def plot_out_degree(lines):\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": 58,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "8e7965d793a146d4bbc268554262eb58",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/controled_…"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/plain": [
+       "<function __main__.plot_na(lines)>"
+      ]
+     },
+     "execution_count": 58,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "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": 59,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "55a1209d0b924a39b4729228e81ee3ab",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/controled_…"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/plain": [
+       "<function __main__.plot_mpc(lines)>"
+      ]
+     },
+     "execution_count": 59,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "def plot_mpc(lines):\n",
+    "    plot(con_viatra_dic, lines, 0, lambda a: a.mpc_distance, colors, 'mpc')\n",
+    "interact(plot_mpc, lines=w)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
    "execution_count": null,
    "metadata": {},
    "outputs": [],