Skip to content
This repository was archived by the owner on Apr 10, 2022. It is now read-only.

Commit 28abf7f

Browse files
authored
Merge pull request #7 from pc494
Bugfix and cosmetic changes
2 parents a2a20dd + 7206449 commit 28abf7f

3 files changed

+11
-11
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/

02 - Clustering Orientations.ipynb

+1-2
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,7 @@
361361
"metadata": {},
362362
"outputs": [],
363363
"source": [
364-
"cluster_means_axangle = AxAngle.from_rotation(cluster_means)\n",
365-
"cluster_means_recentered.axis"
364+
"cluster_means_axangle = AxAngle.from_rotation(cluster_means)"
366365
]
367366
},
368367
{

03 - Clustering Misorientations.ipynb

+9-9
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,16 @@
216216
"metadata": {},
217217
"outputs": [],
218218
"source": [
219-
"from itertools import combinations_with_replacement as icombinations\n",
220-
"from tqdm import tqdm_notebook\n",
221-
"distance = np.empty((misori.size, misori.size))\n",
219+
"#from itertools import combinations_with_replacement as icombinations\n",
220+
"#from tqdm import tqdm_notebook\n",
221+
"#distance = np.empty((misori.size, misori.size))\n",
222222
"\n",
223-
"for i, j in tqdm_notebook(list(icombinations(range(misori.size), 2))):\n",
224-
" m_1, m_2 = misori[i], misori[j]\n",
225-
" mismisori = D6.outer(~m_1).outer(D6).outer(D6).outer(m_2).outer(D6)\n",
226-
" d = mismisori.angle.data.min(axis=(0, 2, 3, 5))\n",
227-
" distance[i, j] = d\n",
228-
" distance[j, i] = d"
223+
"#for i, j in tqdm_notebook(list(icombinations(range(misori.size), 2))):\n",
224+
"# m_1, m_2 = misori[i], misori[j]\n",
225+
"# mismisori = D6.outer(~m_1).outer(D6).outer(D6).outer(m_2).outer(D6)\n",
226+
"# d = mismisori.angle.data.min(axis=(0, 2, 3, 5))\n",
227+
"# distance[i, j] = d\n",
228+
"# distance[j, i] = d"
229229
]
230230
},
231231
{

0 commit comments

Comments
 (0)