From 166ded18ae876c4a742881ded1a62ade40776829 Mon Sep 17 00:00:00 2001
From: Rishi Sharma <rishi.sharma@epfl.ch>
Date: Fri, 10 Dec 2021 18:53:18 +0100
Subject: [PATCH] More graphs

---
 eval/96_nodes_random1.edges | 547 ++++++++++++++++++++++++++++++++++++
 eval/96_nodes_random2.edges | 545 +++++++++++++++++++++++++++++++++++
 eval/main.ipynb             |   8 +-
 eval/plot.py                |   3 +-
 4 files changed, 1099 insertions(+), 4 deletions(-)
 create mode 100644 eval/96_nodes_random1.edges
 create mode 100644 eval/96_nodes_random2.edges

diff --git a/eval/96_nodes_random1.edges b/eval/96_nodes_random1.edges
new file mode 100644
index 0000000..80a3867
--- /dev/null
+++ b/eval/96_nodes_random1.edges
@@ -0,0 +1,547 @@
+96
+0 1
+0 67
+0 68
+0 9
+0 82
+0 19
+0 52
+0 91
+0 95
+1 0
+1 66
+1 2
+1 29
+1 51
+1 91
+1 93
+2 1
+2 3
+2 8
+2 41
+2 14
+2 89
+2 27
+2 93
+3 2
+3 4
+3 8
+3 11
+3 44
+3 77
+3 93
+4 3
+4 5
+4 76
+4 81
+4 18
+4 19
+4 59
+4 29
+5 37
+5 4
+5 53
+5 6
+6 5
+6 7
+6 72
+6 40
+6 47
+6 90
+7 8
+7 90
+7 19
+7 6
+8 2
+8 3
+8 7
+8 41
+8 9
+8 77
+8 78
+8 21
+9 0
+9 8
+9 10
+9 21
+9 89
+9 91
+9 28
+10 80
+10 9
+10 11
+10 93
+11 3
+11 10
+11 12
+11 45
+11 80
+11 87
+12 33
+12 11
+12 13
+12 18
+12 53
+12 55
+13 65
+13 50
+13 12
+13 14
+14 2
+14 13
+14 15
+14 81
+14 52
+14 21
+14 58
+14 91
+15 16
+15 60
+15 29
+15 14
+16 33
+16 15
+16 17
+16 21
+16 24
+16 60
+17 16
+17 81
+17 18
+17 63
+18 4
+18 12
+18 17
+18 51
+18 19
+18 89
+18 29
+19 0
+19 4
+19 37
+19 7
+19 40
+19 47
+19 18
+19 20
+19 22
+19 58
+20 69
+20 76
+20 79
+20 19
+20 21
+20 86
+20 95
+21 34
+21 8
+21 9
+21 74
+21 14
+21 16
+21 20
+21 22
+22 19
+22 21
+22 23
+23 66
+23 82
+23 22
+23 24
+23 89
+23 94
+24 37
+24 38
+24 16
+24 84
+24 23
+24 25
+24 58
+24 27
+25 24
+25 26
+25 61
+26 25
+26 27
+26 69
+27 64
+27 33
+27 2
+27 87
+27 24
+27 26
+27 28
+27 31
+28 69
+28 9
+28 74
+28 27
+28 29
+29 1
+29 4
+29 43
+29 15
+29 18
+29 91
+29 28
+29 30
+30 31
+30 29
+30 55
+31 32
+31 75
+31 27
+31 30
+32 65
+32 33
+32 39
+32 84
+32 31
+33 32
+33 34
+33 67
+33 68
+33 12
+33 77
+33 16
+33 27
+34 33
+34 35
+34 70
+34 21
+34 89
+34 92
+34 61
+35 66
+35 34
+35 36
+35 83
+35 58
+36 67
+36 35
+36 37
+36 85
+36 88
+37 36
+37 5
+37 38
+37 51
+37 19
+37 24
+37 61
+38 37
+38 39
+38 77
+38 82
+38 24
+39 32
+39 38
+39 40
+39 74
+39 43
+39 81
+40 68
+40 6
+40 39
+40 41
+40 19
+40 61
+41 2
+41 8
+41 40
+41 42
+41 43
+41 81
+42 41
+42 43
+42 70
+43 39
+43 41
+43 42
+43 44
+43 29
+44 43
+44 3
+44 45
+45 70
+45 75
+45 11
+45 44
+45 78
+45 79
+45 46
+46 45
+46 47
+47 6
+47 75
+47 46
+47 48
+47 19
+48 73
+48 47
+48 49
+49 48
+49 50
+49 52
+50 13
+50 49
+50 83
+50 51
+50 89
+50 92
+51 1
+51 37
+51 70
+51 80
+51 81
+51 18
+51 50
+51 52
+51 87
+52 0
+52 66
+52 14
+52 49
+52 51
+52 53
+52 62
+52 95
+53 5
+53 71
+53 12
+53 83
+53 52
+53 54
+54 55
+54 53
+54 87
+55 12
+55 54
+55 56
+55 92
+55 30
+55 95
+56 80
+56 81
+56 55
+56 57
+56 91
+57 56
+57 89
+57 90
+57 58
+58 35
+58 71
+58 14
+58 19
+58 24
+58 57
+58 59
+59 58
+59 4
+59 60
+60 15
+60 16
+60 84
+60 59
+60 61
+61 34
+61 37
+61 40
+61 25
+61 60
+61 62
+62 52
+62 61
+62 63
+63 64
+63 17
+63 68
+63 62
+64 65
+64 27
+64 63
+65 32
+65 64
+65 66
+65 13
+65 87
+66 1
+66 65
+66 67
+66 35
+66 52
+66 23
+67 0
+67 33
+67 66
+67 36
+67 68
+67 94
+68 0
+68 33
+68 67
+68 69
+68 40
+68 88
+68 94
+68 63
+69 68
+69 70
+69 20
+69 26
+69 28
+70 34
+70 69
+70 71
+70 42
+70 45
+70 51
+71 72
+71 58
+71 53
+71 70
+72 73
+72 71
+72 6
+72 95
+73 48
+73 74
+73 72
+73 84
+74 39
+74 73
+74 75
+74 21
+74 28
+75 74
+75 76
+75 45
+75 47
+75 93
+75 31
+76 4
+76 75
+76 77
+76 20
+76 87
+76 88
+76 95
+77 33
+77 3
+77 38
+77 8
+77 76
+77 78
+78 8
+78 77
+78 45
+78 79
+79 45
+79 78
+79 80
+79 20
+79 94
+80 88
+80 10
+80 11
+80 79
+80 81
+80 51
+80 56
+80 91
+81 4
+81 39
+81 41
+81 14
+81 80
+81 17
+81 82
+81 51
+81 56
+82 0
+82 38
+82 81
+82 83
+82 23
+82 89
+83 35
+83 82
+83 50
+83 84
+83 53
+84 32
+84 73
+84 83
+84 85
+84 24
+84 60
+85 36
+85 86
+85 84
+86 20
+86 85
+86 87
+87 65
+87 11
+87 76
+87 51
+87 54
+87 86
+87 88
+87 27
+88 36
+88 68
+88 76
+88 80
+88 87
+88 89
+89 2
+89 34
+89 9
+89 18
+89 50
+89 82
+89 23
+89 88
+89 57
+89 90
+90 6
+90 7
+90 89
+90 91
+90 57
+91 0
+91 1
+91 9
+91 14
+91 80
+91 56
+91 90
+91 92
+91 29
+92 34
+92 50
+92 55
+92 91
+92 93
+93 1
+93 2
+93 3
+93 10
+93 75
+93 92
+93 94
+94 67
+94 68
+94 79
+94 23
+94 93
+94 95
+95 0
+95 72
+95 76
+95 20
+95 52
+95 55
+95 94
diff --git a/eval/96_nodes_random2.edges b/eval/96_nodes_random2.edges
new file mode 100644
index 0000000..b6d71f6
--- /dev/null
+++ b/eval/96_nodes_random2.edges
@@ -0,0 +1,545 @@
+96
+0 1
+0 36
+0 13
+0 46
+0 28
+0 95
+1 0
+1 33
+1 2
+1 36
+1 4
+1 43
+1 14
+1 21
+1 91
+1 95
+2 1
+2 3
+2 5
+2 9
+2 23
+2 89
+3 2
+3 4
+3 13
+3 18
+3 90
+4 1
+4 34
+4 3
+4 5
+4 73
+4 10
+4 88
+4 95
+5 2
+5 66
+5 4
+5 6
+5 74
+5 54
+5 90
+6 5
+6 7
+6 74
+6 16
+6 49
+6 80
+6 31
+7 6
+7 8
+7 80
+7 53
+7 21
+7 92
+8 64
+8 68
+8 7
+8 41
+8 9
+8 11
+8 45
+8 54
+8 88
+9 32
+9 2
+9 35
+9 8
+9 10
+9 76
+9 17
+9 85
+9 55
+10 34
+10 4
+10 38
+10 9
+10 11
+11 8
+11 42
+11 10
+11 76
+11 12
+12 73
+12 11
+12 13
+12 56
+12 58
+12 88
+13 0
+13 3
+13 74
+13 12
+13 14
+13 80
+13 25
+14 1
+14 42
+14 13
+14 15
+14 63
+15 39
+15 14
+15 47
+15 16
+15 25
+16 34
+16 36
+16 6
+16 15
+16 17
+17 9
+17 45
+17 79
+17 16
+17 18
+17 24
+17 26
+17 59
+18 3
+18 17
+18 19
+18 84
+18 91
+19 39
+19 41
+19 48
+19 18
+19 20
+19 91
+20 90
+20 19
+20 21
+20 22
+20 26
+21 32
+21 1
+21 7
+21 74
+21 20
+21 22
+21 90
+21 95
+22 74
+22 50
+22 20
+22 21
+22 23
+23 2
+23 66
+23 40
+23 46
+23 48
+23 22
+23 24
+23 95
+24 17
+24 27
+24 25
+24 23
+25 13
+25 15
+25 88
+25 24
+25 26
+25 94
+26 17
+26 20
+26 25
+26 27
+26 61
+27 34
+27 69
+27 45
+27 28
+27 24
+27 26
+27 60
+28 0
+28 64
+28 85
+28 57
+28 27
+28 29
+29 65
+29 78
+29 50
+29 28
+29 61
+29 30
+30 38
+30 43
+30 93
+30 29
+30 31
+31 32
+31 67
+31 6
+31 48
+31 93
+31 30
+32 33
+32 35
+32 37
+32 9
+32 43
+32 21
+32 91
+32 92
+32 93
+32 31
+33 32
+33 1
+33 34
+33 71
+34 33
+34 35
+34 4
+34 10
+34 16
+34 81
+34 27
+35 32
+35 34
+35 36
+35 9
+35 51
+36 0
+36 1
+36 35
+36 37
+36 16
+36 56
+37 32
+37 60
+37 38
+37 36
+38 37
+38 39
+38 10
+38 45
+38 30
+39 40
+39 19
+39 38
+39 15
+40 39
+40 41
+40 48
+40 23
+40 91
+40 63
+41 8
+41 40
+41 42
+41 19
+41 85
+42 41
+42 43
+42 11
+42 14
+42 53
+43 32
+43 1
+43 42
+43 44
+43 45
+43 30
+44 43
+44 67
+44 45
+44 46
+45 38
+45 8
+45 43
+45 44
+45 46
+45 17
+45 87
+45 27
+46 0
+46 44
+46 77
+46 45
+46 47
+46 23
+46 61
+46 95
+47 48
+47 65
+47 46
+47 15
+48 40
+48 47
+48 49
+48 19
+48 86
+48 23
+48 60
+48 31
+49 6
+49 79
+49 48
+49 50
+49 89
+50 81
+50 49
+50 51
+50 22
+50 29
+51 35
+51 50
+51 52
+51 86
+51 90
+51 94
+52 66
+52 51
+52 53
+53 7
+53 42
+53 52
+53 54
+53 56
+53 90
+54 8
+54 53
+54 5
+54 55
+55 65
+55 9
+55 56
+55 54
+56 36
+56 74
+56 12
+56 53
+56 55
+56 57
+57 56
+57 58
+57 28
+58 57
+58 59
+58 12
+59 70
+59 75
+59 17
+59 58
+59 60
+60 37
+60 59
+60 48
+60 27
+60 61
+61 46
+61 29
+61 26
+61 60
+61 93
+61 62
+62 68
+62 93
+62 85
+62 61
+62 63
+63 64
+63 40
+63 14
+63 93
+63 62
+64 8
+64 65
+64 28
+64 63
+65 64
+65 66
+65 69
+65 74
+65 47
+65 55
+65 29
+66 65
+66 67
+66 69
+66 5
+66 52
+66 23
+67 66
+67 68
+67 44
+67 86
+67 31
+68 8
+68 67
+68 69
+68 62
+69 65
+69 66
+69 68
+69 70
+69 77
+69 83
+69 27
+70 59
+70 69
+70 78
+70 71
+71 33
+71 70
+71 72
+71 87
+71 90
+72 73
+72 90
+72 71
+73 72
+73 74
+73 4
+73 12
+74 65
+74 5
+74 6
+74 73
+74 75
+74 13
+74 21
+74 22
+74 56
+75 74
+75 59
+75 76
+76 9
+76 75
+76 11
+76 77
+77 69
+77 76
+77 78
+77 46
+77 93
+78 70
+78 77
+78 79
+78 87
+78 29
+79 80
+79 17
+79 78
+79 49
+80 6
+80 7
+80 13
+80 79
+80 81
+80 85
+81 34
+81 80
+81 50
+81 82
+81 88
+82 81
+82 83
+83 82
+83 84
+83 69
+84 18
+84 83
+84 85
+84 95
+85 9
+85 41
+85 80
+85 84
+85 86
+85 88
+85 28
+85 62
+86 67
+86 48
+86 51
+86 85
+86 87
+86 88
+87 71
+87 45
+87 78
+87 86
+87 88
+88 89
+88 4
+88 8
+88 12
+88 81
+88 85
+88 86
+88 87
+88 25
+89 88
+89 49
+89 2
+89 90
+90 3
+90 5
+90 71
+90 72
+90 51
+90 20
+90 21
+90 53
+90 89
+90 91
+91 32
+91 1
+91 40
+91 18
+91 19
+91 90
+91 92
+92 32
+92 91
+92 93
+92 7
+93 32
+93 77
+93 63
+93 30
+93 94
+93 92
+93 61
+93 62
+93 31
+94 25
+94 51
+94 93
+94 95
+95 0
+95 1
+95 4
+95 46
+95 84
+95 21
+95 23
+95 94
diff --git a/eval/main.ipynb b/eval/main.ipynb
index 5ec70cf..d5ad1b7 100644
--- a/eval/main.ipynb
+++ b/eval/main.ipynb
@@ -521,14 +521,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
     "from decentralizepy.graphs.SmallWorld import SmallWorld\n",
     "\n",
-    "s = SmallWorld(96, 2, .5)\n",
-    "s.write_graph_to_file('96_nodes.edges')"
+    "s1 = SmallWorld(96, 2, 1.0)\n",
+    "s1.write_graph_to_file('96_nodes_random1.edges')\n",
+    "s2 = SmallWorld(96, 2, 1.0)\n",
+    "s2.write_graph_to_file('96_nodes_random2.edges')"
    ]
   },
   {
diff --git a/eval/plot.py b/eval/plot.py
index af04b0e..2782f2b 100644
--- a/eval/plot.py
+++ b/eval/plot.py
@@ -36,6 +36,7 @@ def plot(means, stdevs, mins, maxs, title, label, loc):
 
 def plot_results(path):
     folders = os.listdir(path)
+    folders.sort()
     print("Reading folders from: ", path)
     print("Folders: ", folders)
     for folder in folders:
@@ -103,4 +104,4 @@ def plot_parameters(path):
 if __name__ == "__main__":
     assert len(sys.argv) == 2
     plot_results(sys.argv[1])
-    plot_parameters(sys.argv[1])
+    # plot_parameters(sys.argv[1])
-- 
GitLab