Skip to content

Commit 566ec6d

Browse files
committed
some minor fixes after the publication
1 parent a514a28 commit 566ec6d

11 files changed

+35
-173
lines changed

backbone/backbone_colored_circle_just_selected.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
#usage: python backbone_colored_circle_just_selected.py
88

9-
sorting_index = np.loadtxt('../MaxAbs_edds_sorting_index_ltof.txt', dtype=int)
9+
sorting_index = np.loadtxt('../MaxAbs_ewds_sorting_index_ltof.txt', dtype=int)
1010

1111
chList = np.loadtxt('../ChList.txt', dtype=str)
1212

1313
chList_color = np.loadtxt('../ChList_colored.txt', dtype=str)
1414

1515
source, target = np.loadtxt('../edgelist.txt', unpack=True, dtype=int)
1616

17-
data = np.loadtxt('../MaxAbs_edds_just_3.txt', skiprows=3)
17+
data = np.loadtxt('../MaxAbs_ewds_just_3.txt', skiprows=3)
1818

1919
data = data[:3570,:]
2020

backbone/plot_edge_colors_selected.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
edge_colors = np.loadtxt('edge_colors_selected.txt')
99

10-
data = np.loadtxt('../MaxAbs_edds_just_3.txt', skiprows=3)
10+
data = np.loadtxt('../MaxAbs_ewds_just_3.txt', skiprows=3)
1111

1212
data = data[:3570,:]
1313

14-
sorting_index = np.loadtxt('../MaxAbs_edds_sorting_index_ltof.txt', dtype=int)
14+
sorting_index = np.loadtxt('../MaxAbs_ewds_sorting_index_ltof.txt', dtype=int)
1515

1616
fig, axes = plt.subplots(nrows=1, ncols=2, figsize=(30,40))
1717

backbone/plot_edge_colors_selected_both.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
edge_colors = np.loadtxt('edge_colors_selected.txt')
99

10-
data = np.loadtxt('../MaxAbs_edds_just_3.txt', skiprows=3)
10+
data = np.loadtxt('../MaxAbs_ewds_just_3.txt', skiprows=3)
1111

1212
data = data[:3570,:]
1313

14-
sorting_index = np.loadtxt('../MaxAbs_edds_sorting_index_ltof.txt', dtype=int)
14+
sorting_index = np.loadtxt('../MaxAbs_ewds_sorting_index_ltof.txt', dtype=int)
1515

1616
new_data = []
1717
new_edge_colors = []

cliffs/ndd_by_nodes_Cliffs_individual_together.py

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import numpy as np
2-
import matplotlib.pyplot as plt
3-
from matplotlib import cm
4-
import matplotlib
52
import sys
6-
import os
73

8-
#usage: python ndd_by_nodes_Cliffs_individual_together.py MaxAbs ChList.txt MaxAbs_ndds_ln_by_each_raw_data.txt
4+
#usage: python ndd_by_nodes_Cliffs_individual_together.py MaxAbs
95

106
def ED(A,B):
117

@@ -28,32 +24,9 @@ def ED(A,B):
2824

2925
name = sys.argv[1]
3026

31-
cl = sys.argv[2]
32-
33-
bins = sys.argv[3]
34-
35-
ticks = np.loadtxt(cl, dtype=str)
36-
37-
lines = [line.rstrip('\n') for line in open(bins)]
38-
39-
bin_min, bin_max = lines[0].split(" ")
40-
41-
bin_min = np.round(float(bin_min),2)
42-
bin_max = np.round(float(bin_max),2)
43-
44-
fontsize = 36
45-
46-
matplotlib.rcParams.update({'font.size': fontsize})
47-
4827
names = ["Control", "EtOH"]
49-
tnames = {}
50-
tnames["Control"] = "G1 - control"
51-
tnames["EtOH"] = "G1 - EtOH"
5228

5329
#names = ["TP1", "TP2"]
54-
#tnames = {}
55-
#tnames["TP1"] = "G2 - tp1"
56-
#tnames["TP2"] = "G2 - tp2"
5730

5831
# -----
5932

@@ -66,7 +39,6 @@ def ED(A,B):
6639

6740
if (subplot_index == 0):
6841
A = data
69-
plt.subplots_adjust(right=0.9)
7042
else:
7143
B = data
7244

cliffs/newd_by_nodes_Cliffs_individual_together.py

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import numpy as np
2-
import matplotlib.pyplot as plt
3-
from matplotlib import cm
4-
import matplotlib
52
import sys
6-
import os
73

8-
#usage: python newd_by_nodes_Cliffs_individual_together.py MaxAbs ChList.txt MaxAbs_newds_by_each_raw_data.txt
4+
#usage: python newd_by_nodes_Cliffs_individual_together.py MaxAbs
95

106
def ED(A,B):
117

@@ -52,33 +48,12 @@ def ED(A,B):
5248

5349
name = sys.argv[1]
5450

55-
cl = sys.argv[2]
56-
57-
bins = sys.argv[3]
58-
59-
ticks = np.loadtxt(cl, dtype=str)
60-
61-
lines = [line.rstrip('\n') for line in open(bins)]
62-
63-
bin_min, bin_max = lines[0].split(" ")
64-
65-
bin_min = np.round(float(bin_min),2)
66-
bin_max = np.round(float(bin_max),2)
67-
68-
fontsize = 36
69-
70-
matplotlib.rcParams.update({'font.size': fontsize})
7151

7252
names = ["Control", "EtOH"]
73-
tnames = {}
74-
tnames["Control"] = "G1 - control"
75-
tnames["EtOH"] = "G1 - EtOH"
7653

7754
# names = ["TP1", "TP2"]
78-
# tnames = {}
79-
# tnames["TP1"] = "G2 - tp1"
80-
# tnames["TP2"] = "G2 - tp2"
8155

56+
# -----
8257

8358
for i in range(1,19):
8459

@@ -89,7 +64,6 @@ def ED(A,B):
8964

9065
if (subplot_index == 0):
9166
A = data
92-
plt.subplots_adjust(right=0.9)
9367
else:
9468
B = data
9569

plot/ewd_by_nodes_sorting_just_3_fig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import sys
66
import os
77

8-
#usage: python ewds_by_nodes_sorting_just_3_fig.py MaxAbs 30 MaxAbs_edds_just_3.txt MaxAbs_edds_sorting_index_ltof.txt
8+
#usage: python ewds_by_nodes_sorting_just_3_fig.py MaxAbs 30 MaxAbs_ewds_just_3.txt MaxAbs_ewds_sorting_index_ltof.txt
99

1010
name = sys.argv[1]
1111

plot/ndd_by_nodes_sorting_just_2_Cliffs_average_FIG_sml.py

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
sorting = sys.argv[5]
1919

20-
ED_average = sys.argv[6]
20+
Cliffs_average = sys.argv[6]
2121

22-
ED_values = np.loadtxt(ED_average)
22+
Cliffs_values = np.loadtxt(Cliffs_average)
2323

24-
ED_values *= -1.0 # switch order
24+
Cliffs_values *= -1.0 # switch order
2525

2626
data = np.loadtxt(filename, skiprows=4)
2727

@@ -63,33 +63,13 @@
6363

6464
# names = ["G2 - tp1\n", "G2 - tp2\n"]
6565

66-
# names = ["G1 - control\n", "G2 - tp1\n"]
67-
68-
# names = ["G2 - tp2\n", "G1 - EtOH\n"]
69-
70-
# names = ["G1 - control\n", "G2 - tp2\n"]
71-
72-
# names = ["G1 - EtOH\n", "G1 - control\n"]
73-
74-
# names = ["G1 - EtOH\n", "G2 - tp1\n"]
75-
76-
# names = ["G1 - EtOH\n", "G2 - tp2\n"]
77-
78-
# names = ["G2 - tp1\n", "G1 - control\n"]
79-
80-
# names = ["G2 - tp1\n", "G1 - EtOH\n"]
81-
82-
# names = ["G2 - tp2\n", "G1 - control\n"]
83-
84-
# names = ["G2 - tp2\n", "G2 - tp1\n"]
85-
8666
ax = plt.subplot(144)
8767

8868
ax.set_position([0.89, 0.0925, 0.04, 0.839])
8969

9070
plt.title("$\delta$\n")
9171

92-
tmp = ED_values.copy()
72+
tmp = Cliffs_values.copy()
9373

9474
tmp = np.abs(tmp)
9575

@@ -123,11 +103,11 @@
123103

124104
plt.title("$\delta$\n")
125105

126-
ED_values = np.expand_dims(ED_values, axis=1)
106+
Cliffs_values = np.expand_dims(Cliffs_values, axis=1)
127107

128-
print(np.amin(ED_values), np.amax(ED_values))
108+
print(np.amin(Cliffs_values), np.amax(Cliffs_values))
129109

130-
im = plt.imshow(ED_values[sorting_index], cmap=cm.coolwarm, interpolation='nearest', aspect='auto', vmin=-0.5, vmax=0.5)
110+
im = plt.imshow(Cliffs_values[sorting_index], cmap=cm.coolwarm, interpolation='nearest', aspect='auto', vmin=-0.5, vmax=0.5)
131111

132112
plt.yticks([])
133113

plot/ndd_by_nodes_sorting_just_2_Marozzi_Cliffs_average_FIG.py

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
sorting = sys.argv[5]
1919

20-
ED_average = sys.argv[6]
20+
Cliffs_average = sys.argv[6]
2121

2222
Marozzi = sys.argv[7]
2323

24-
ED_values = np.loadtxt(ED_average)
24+
Ciffs_values = np.loadtxt(Cliffs_average)
2525

26-
ED_values *= -1.0 # switch order
26+
Ciffs_values *= -1.0 # switch order
2727

2828
pvalues = np.loadtxt(Marozzi)
2929

@@ -57,26 +57,6 @@
5757

5858
# names = ["G2 - tp1\n", "G2 - tp2\n"]
5959

60-
# names = ["G1 - control\n", "G2 - tp1\n"]
61-
62-
# names = ["G2 - tp2\n", "G1 - EtOH\n"]
63-
64-
# names = ["G1 - control\n", "G2 - tp2\n"]
65-
66-
# names = ["G1 - EtOH\n", "G1 - control\n"]
67-
68-
# names = ["G1 - EtOH\n", "G2 - tp1\n"]
69-
70-
# names = ["G1 - EtOH\n", "G2 - tp2\n"]
71-
72-
# names = ["G2 - tp1\n", "G1 - control\n"]
73-
74-
# names = ["G2 - tp1\n", "G1 - EtOH\n"]
75-
76-
# names = ["G2 - tp2\n", "G1 - control\n"]
77-
78-
# names = ["G2 - tp2\n", "G2 - tp1\n"]
79-
8060
ax = plt.subplot(144)
8161

8262
ax.set_position([0.89, 0.0925, 0.04, 0.839])
@@ -105,11 +85,11 @@
10585

10686
plt.title("$\delta$\n")
10787

108-
ED_values = np.expand_dims(ED_values, axis=1)
88+
Ciffs_values = np.expand_dims(Ciffs_values, axis=1)
10989

110-
print(np.amin(ED_values), np.amax(ED_values))
90+
print(np.amin(Ciffs_values), np.amax(Ciffs_values))
11191

112-
im = plt.imshow(ED_values[sorting_index], cmap=cm.coolwarm, interpolation='nearest', aspect='auto', vmin=-0.5, vmax=0.5)
92+
im = plt.imshow(Ciffs_values[sorting_index], cmap=cm.coolwarm, interpolation='nearest', aspect='auto', vmin=-0.5, vmax=0.5)
11393

11494
plt.yticks([])
11595

plot/newd_by_nodes_sorting_just_2_Cliffs_average_orig_FIG_2delta_sml.py

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
sorting = sys.argv[5]
1919

20-
ED_average = sys.argv[6]
20+
Cliffs_average = sys.argv[6]
2121

22-
ED_values = np.loadtxt(ED_average)
22+
Cliffs_values = np.loadtxt(Cliffs_average)
2323

24-
ED_values *= -1.0 # switch order
24+
Cliffs_values *= -1.0 # switch order
2525

2626
data = np.loadtxt(filename, skiprows=4)
2727

@@ -58,39 +58,17 @@
5858

5959
fig.tight_layout(rect=[0.13, 0.07, 0.88, 0.95], w_pad=3, h_pad=8.0)
6060

61-
# names = ["G1 - control - part 1\n", "G1 - EtOH - part 2\n"]
62-
6361
names = ["G1 - control\n", "G1 - EtOH\n"]
6462

6563
# names = ["G2 - tp1\n", "G2 - tp2\n"]
6664

67-
# names = ["G1 - control\n", "G2 - tp1\n"]
68-
69-
# names = ["G2 - tp2\n", "G1 - EtOH\n"]
70-
71-
# names = ["G1 - control\n", "G2 - tp2\n"]
72-
73-
# names = ["G1 - EtOH\n", "G1 - control\n"]
74-
75-
# names = ["G1 - EtOH\n", "G2 - tp1\n"]
76-
77-
# names = ["G1 - EtOH\n", "G2 - tp2\n"]
78-
79-
# names = ["G2 - tp1\n", "G1 - control\n"]
80-
81-
# names = ["G2 - tp1\n", "G1 - EtOH\n"]
82-
83-
# names = ["G2 - tp2\n", "G1 - control\n"]
84-
85-
# names = ["G2 - tp2\n", "G2 - tp1\n"]
86-
8765
ax = plt.subplot(144)
8866

8967
ax.set_position([0.89, 0.0925, 0.06, 0.839])
9068

9169
plt.title("$\delta_n \delta_p$\n")
9270

93-
tmp = ED_values.copy()
71+
tmp = Cliffs_values.copy()
9472

9573
tmp = np.abs(tmp)
9674

@@ -131,9 +109,9 @@
131109

132110
plt.title("$\delta_n \delta_p$\n")
133111

134-
print(np.amin(ED_values), np.amax(ED_values))
112+
print(np.amin(Cliffs_values), np.amax(Cliffs_values))
135113

136-
im = plt.imshow(ED_values[sorting_index], cmap=cm.coolwarm, interpolation='nearest', aspect='auto', vmin=-0.5, vmax=0.5)
114+
im = plt.imshow(Cliffs_values[sorting_index], cmap=cm.coolwarm, interpolation='nearest', aspect='auto', vmin=-0.5, vmax=0.5)
137115

138116
plt.yticks([])
139117

0 commit comments

Comments
 (0)