1 files changed, 54 insertions, 67 deletions

diff --git a/Metrics/Metrics-Calculation/metrics_plot/src/metrics_distance.ipynb b/Metrics/Metrics-Calculation/metrics_plot/src/metrics_distance.ipynb
index c7bf9817..550e3978 100644
--- a/Metrics/Metrics-Calculation/metrics_plot/src/metrics_distance.ipynb
+++ b/Metrics/Metrics-Calculation/metrics_plot/src/metrics_distance.ipynb
@@ -16,7 +16,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 48,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -28,7 +28,8 @@
     "import ipywidgets as widgets\n",
     "import matplotlib.pyplot as plt\n",
     "import random\n",
-    "import numpy as np\n"
+    "import numpy as np\n",
+    "import constants\n"
    ]
   },
   {
@@ -47,7 +48,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 49,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -77,7 +78,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 50,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -86,26 +87,29 @@
     "    for target in targets:\n",
     "        value, p = stats.ks_2samp(target, sample)\n",
     "        distance += value\n",
-    "    \n",
     "    distance = distance / len(targets)\n",
     "    return distance\n"
    ]
   },
   {
    "cell_type": "markdown",
-   "source": [
-    "* Find the median ks distance of the same number of nodes"
-   ],
    "metadata": {
-    "collapsed": false,
     "pycharm": {
      "name": "#%% md\n"
     }
-   }
+   },
+   "source": [
+    "* Find the median ks distance of the same number of nodes"
+   ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 51,
+   "metadata": {
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   },
    "outputs": [],
    "source": [
     "def find_median(x, metric_distances):\n",
@@ -123,13 +127,7 @@
     "    median_x = np.array(median_x)[order]\n",
     "    median_y = np.array(y)[order]\n",
     "    return median_x, median_y\n"
-   ],
-   "metadata": {
-    "collapsed": false,
-    "pycharm": {
-     "name": "#%%\n"
-    }
-   }
+   ]
   },
   {
    "cell_type": "markdown",
@@ -140,7 +138,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 52,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -171,7 +169,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 53,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -188,11 +186,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 54,
    "metadata": {},
    "outputs": [],
    "source": [
-    "human = GraphCollection('../statistics/humanOutput/', 300, 'Human')\n",
+    "human = GraphCollection('../statistics/humanOutput/', 300, 'Human', True)\n",
     "file_names = reader.readmultiplefiles('../statistics/viatraEvolve/', 1000, False)"
    ]
   },
@@ -205,7 +203,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 55,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -223,13 +221,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 56,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "a42a037c9020429982c906d0b100645b",
+       "model_id": "ca7932bce2a741afaff6b919042c42b0",
        "version_major": 2,
        "version_minor": 0
       },
@@ -275,7 +273,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 57,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -308,18 +306,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 63,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "248ad5232bb6454589c95c2b92b74db7",
+       "model_id": "08da62cb0c3f4e6e9591c7dc811d27cc",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/trajectori…"
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(1,), options={'../statistics/trajectori…"
       ]
      },
      "metadata": {},
@@ -331,7 +329,7 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 10,
+     "execution_count": 63,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -351,18 +349,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
-   "metadata": {},
+   "execution_count": 64,
+   "metadata": {
+    "scrolled": true
+   },
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "0df16294cd86434b8f144ff08702d44a",
+       "model_id": "a708f43645a24bd2b15b53ea12c7d88f",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/trajectori…"
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(1,), options={'../statistics/trajectori…"
       ]
      },
      "metadata": {},
@@ -371,18 +371,18 @@
     {
      "data": {
       "text/plain": [
-       "<function __main__.plot_out_degree(lines)>"
+       "<function __main__.plot_na(lines)>"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 64,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "def plot_out_degree(lines):\n",
+    "def plot_na(lines):\n",
     "    plot(info_dic, lines, 0, lambda a: a.na_distance, colors, 'node activity')\n",
-    "interact(plot_out_degree, lines=w)"
+    "interact(plot_na, lines=w)"
    ]
   },
   {
@@ -394,18 +394,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 65,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "b4e76d41b3d644808e47e3d1d7aaf1a7",
+       "model_id": "124a0cb0ebfb4225bf4ced24c09032f7",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "interactive(children=(SelectMultiple(description='Trajectory:', index=(0,), options={'../statistics/trajectori…"
+       "interactive(children=(SelectMultiple(description='Trajectory:', index=(1,), options={'../statistics/trajectori…"
       ]
      },
      "metadata": {},
@@ -417,7 +424,7 @@
        "<function __main__.plot_out_degree(lines)>"
       ]
      },
-     "execution_count": 12,
+     "execution_count": 65,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -430,35 +437,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 42,
+   "execution_count": 19,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "../statistics/viatraEvolve\\state_735.csv\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "for name in file_names:\n",
     "    contents = reader.readcsvfile(name)\n",
     "    if(contents['State Id'][0] == 1032396643):\n",
     "        print(name)"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": []
   }
  ],
  "metadata": {
@@ -482,13 +469,13 @@
   "pycharm": {
    "stem_cell": {
     "cell_type": "raw",
-    "source": [],
     "metadata": {
      "collapsed": false
-    }
+    },
+    "source": []
    }
   }
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
\ No newline at end of file
+}