From b667a2bbdba7fbe6422dac671874bfe563b67eb8 Mon Sep 17 00:00:00 2001 From: Ralf Hielscher Date: Thu, 19 Nov 2015 09:12:44 +0100 Subject: [PATCH 1/2] tripel should be triple --- EBSDAnalysis/@grain2d/grain2d.m | 16 ++--- EBSDAnalysis/@grainBoundary/grainBoundary.m | 14 ++-- EBSDAnalysis/@grainBoundary/subSet.m | 6 +- .../display.m | 30 ++++----- .../plot.m | 8 +-- .../private/subsind.m | 0 .../subSet.m | 0 .../subsasgn.m | 2 +- .../subsref.m | 0 .../triplePointList.m} | 4 +- doc/BoundaryAnalysis/BoundaryAnalysis.toc | 2 +- .../{TripelPoints.m => TriplePoints.m} | 66 +++++++++---------- doc/ReleaseNotes/changelog.m | 8 +-- tools/math_tools/{allTripel.m => allTriple.m} | 4 +- 14 files changed, 80 insertions(+), 80 deletions(-) rename EBSDAnalysis/{@tripelPointList => @triplePointList}/display.m (51%) rename EBSDAnalysis/{@tripelPointList => @triplePointList}/plot.m (89%) rename EBSDAnalysis/{@tripelPointList => @triplePointList}/private/subsind.m (100%) rename EBSDAnalysis/{@tripelPointList => @triplePointList}/subSet.m (100%) rename EBSDAnalysis/{@tripelPointList => @triplePointList}/subsasgn.m (96%) rename EBSDAnalysis/{@tripelPointList => @triplePointList}/subsref.m (100%) rename EBSDAnalysis/{@tripelPointList/tripelPointList.m => @triplePointList/triplePointList.m} (93%) rename doc/BoundaryAnalysis/{TripelPoints.m => TriplePoints.m} (57%) rename tools/math_tools/{allTripel.m => allTriple.m} (61%) diff --git a/EBSDAnalysis/@grain2d/grain2d.m b/EBSDAnalysis/@grain2d/grain2d.m index 246ec6d72..9821d39b4 100644 --- a/EBSDAnalysis/@grain2d/grain2d.m +++ b/EBSDAnalysis/@grain2d/grain2d.m @@ -26,7 +26,7 @@ GOS % intragranular average misorientation angle x % x coordinates of the vertices of the grains y % y coordinates of the vertices of the grains - tripelPoints % tripel points + triplePoints % triple points end properties (Dependent = true, Access = protected) @@ -122,9 +122,9 @@ function grains = set.V(grains,V) grains.boundary.V = V; - % update V in tripel points - tP = grains.tripelPoints; - grains.tripelPoints.V = V(tP.id,:); + % update V in triple points + tP = grains.triplePoints; + grains.triplePoints.V = V(tP.id,:); end function idV = get.idV(grains) @@ -157,12 +157,12 @@ unit = grains.boundary.scanUnit; end - function tP = get.tripelPoints(grains) - tP = grains.boundary.tripelPoints; + function tP = get.triplePoints(grains) + tP = grains.boundary.triplePoints; end - function grains = set.tripelPoints(grains,tP) - grains.boundary.tripelPoints = tP; + function grains = set.triplePoints(grains,tP) + grains.boundary.triplePoints = tP; end end diff --git a/EBSDAnalysis/@grainBoundary/grainBoundary.m b/EBSDAnalysis/@grainBoundary/grainBoundary.m index 20527c77b..3277c213f 100644 --- a/EBSDAnalysis/@grainBoundary/grainBoundary.m +++ b/EBSDAnalysis/@grainBoundary/grainBoundary.m @@ -22,7 +22,7 @@ properties V = [] % vertices x,y coordinates scanUnit = 'um' % unit of the vertice coordinates - tripelPoints % tripel points + triplePoints % triple points end properties (Dependent = true) @@ -83,10 +83,10 @@ inv(ebsd.rotations(gB.ebsdId(isNotBoundary,2))) ... .* ebsd.rotations(gB.ebsdId(isNotBoundary,1)); - % compute tripel points + % compute triple points I_VF = gB.I_VF; I_VG = (I_VF * gB.I_FG)==2; - % tripel points are those with exactly 3 neigbouring grains and 3 + % triple points are those with exactly 3 neigbouring grains and 3 % boundary segments itP = full(sum(I_VG,2)==3 & sum(I_VF,2)==3); [tpGrainId,~] = find(I_VG(itP,:).'); @@ -94,15 +94,15 @@ tpPhaseId = full(grainsPhaseId(tpGrainId)); % compute ebsdId - % first step: compute faces at the tripel point + % first step: compute faces at the triple point % clean up incidence matrix %I_FD(~any(I_FD,2),:) = []; - % incidence matrix between tripel points and voronoi cells + % incidence matrix between triple points and voronoi cells %I_TD = I_VF(itP,:) * I_FD; [tPBoundaryId,~] = find(I_VF(itP,:).'); tPBoundaryId = reshape(tPBoundaryId,3,[]).'; - gB.tripelPoints = tripelPointList(find(itP),gB.V(itP,:),... + gB.triplePoints = triplePointList(find(itP),gB.V(itP,:),... tpGrainId,tPBoundaryId,tpPhaseId,gB.phaseMap,gB.CSList); end @@ -173,7 +173,7 @@ A_F = I_VF.' * I_VF; %#ok end - %function tp = get.tripelPoints(gB) + %function tp = get.triplePoints(gB) %end diff --git a/EBSDAnalysis/@grainBoundary/subSet.m b/EBSDAnalysis/@grainBoundary/subSet.m index 9e3ff81e0..d8aa009be 100644 --- a/EBSDAnalysis/@grainBoundary/subSet.m +++ b/EBSDAnalysis/@grainBoundary/subSet.m @@ -15,6 +15,6 @@ gB.phaseId = gB.phaseId(ind,:); gB.misrotation = gB.misrotation(ind); -% restrict tripel points -tP = gB.tripelPoints; -gB.tripelPoints = subSet(tP,any(gB.I_VF(tP.id,:),2)); +% restrict triple points +tP = gB.triplePoints; +gB.triplePoints = subSet(tP,any(gB.I_VF(tP.id,:),2)); diff --git a/EBSDAnalysis/@tripelPointList/display.m b/EBSDAnalysis/@triplePointList/display.m similarity index 51% rename from EBSDAnalysis/@tripelPointList/display.m rename to EBSDAnalysis/@triplePointList/display.m index 15049335f..4e1bc0b58 100644 --- a/EBSDAnalysis/@tripelPointList/display.m +++ b/EBSDAnalysis/@triplePointList/display.m @@ -8,7 +8,7 @@ function display(tP,varargin) % --------------------------------- disp(' '); -h = doclink('tripelPointList_index','tripelPointList'); +h = doclink('triplePointList_index','triplePointList'); if check_option(varargin,'vname') h = [get_option(varargin,'vname'), ' = ' h]; @@ -19,39 +19,39 @@ function display(tP,varargin) % empty grain boundary set if isempty(tP) - disp(' no tripel points in the list!') + disp(' no triple points in the list!') return end disp(' ') -tripel = allTripel(1:numel(tP.phaseMap)); +triple = allTriple(1:numel(tP.phaseMap)); % ebsd.phaseMap -matrix = cell(size(tripel,1),4); +matrix = cell(size(triple,1),4); -for ip = 1:size(tripel,1) +for ip = 1:size(triple,1) - num(ip) = nnz(tP.hasPhaseId(tripel(ip,1),tripel(ip,2),tripel(ip,3))); %#ok + num(ip) = nnz(tP.hasPhaseId(triple(ip,1),triple(ip,2),triple(ip,3))); %#ok matrix{ip,1} = int2str(num(ip)); % phases - if ischar(tP.CSList{tripel(ip,1)}) - matrix{ip,2} = tP.CSList{tripel(ip,1)}; + if ischar(tP.CSList{triple(ip,1)}) + matrix{ip,2} = tP.CSList{triple(ip,1)}; else - matrix{ip,2} = tP.CSList{tripel(ip,1)}.mineral; + matrix{ip,2} = tP.CSList{triple(ip,1)}.mineral; end - if ischar(tP.CSList{tripel(ip,2)}) - matrix{ip,3} = tP.CSList{tripel(ip,2)}; + if ischar(tP.CSList{triple(ip,2)}) + matrix{ip,3} = tP.CSList{triple(ip,2)}; else - matrix{ip,3} = tP.CSList{tripel(ip,2)}.mineral; + matrix{ip,3} = tP.CSList{triple(ip,2)}.mineral; end - if ischar(tP.CSList{tripel(ip,3)}) - matrix{ip,4} = tP.CSList{tripel(ip,3)}; + if ischar(tP.CSList{triple(ip,3)}) + matrix{ip,4} = tP.CSList{triple(ip,3)}; else - matrix{ip,4} = tP.CSList{tripel(ip,3)}.mineral; + matrix{ip,4} = tP.CSList{triple(ip,3)}.mineral; end end diff --git a/EBSDAnalysis/@tripelPointList/plot.m b/EBSDAnalysis/@triplePointList/plot.m similarity index 89% rename from EBSDAnalysis/@tripelPointList/plot.m rename to EBSDAnalysis/@triplePointList/plot.m index 05741dd96..8e82b5f75 100644 --- a/EBSDAnalysis/@tripelPointList/plot.m +++ b/EBSDAnalysis/@triplePointList/plot.m @@ -5,12 +5,12 @@ % the function % % Syntax -% plot(grains.tripelPoints) -% plot(grains.tripelPoints,'color','r') -% plot(grains('Forsterite').tripelPoints,gB('Forsterite','Forsterite').misorientation.angle) +% plot(grains.triplePoints) +% plot(grains.triplePoints,'color','r') +% plot(grains('Forsterite').triplePoints,gB('Forsterite','Forsterite').misorientation.angle) % % Input -% tP - @tripelPointList +% tP - @triplePointList % % Options % linewidth diff --git a/EBSDAnalysis/@tripelPointList/private/subsind.m b/EBSDAnalysis/@triplePointList/private/subsind.m similarity index 100% rename from EBSDAnalysis/@tripelPointList/private/subsind.m rename to EBSDAnalysis/@triplePointList/private/subsind.m diff --git a/EBSDAnalysis/@tripelPointList/subSet.m b/EBSDAnalysis/@triplePointList/subSet.m similarity index 100% rename from EBSDAnalysis/@tripelPointList/subSet.m rename to EBSDAnalysis/@triplePointList/subSet.m diff --git a/EBSDAnalysis/@tripelPointList/subsasgn.m b/EBSDAnalysis/@triplePointList/subsasgn.m similarity index 96% rename from EBSDAnalysis/@tripelPointList/subsasgn.m rename to EBSDAnalysis/@triplePointList/subsasgn.m index 0cd93f424..233d8c5ad 100644 --- a/EBSDAnalysis/@tripelPointList/subsasgn.m +++ b/EBSDAnalysis/@triplePointList/subsasgn.m @@ -1,7 +1,7 @@ function tP = subsasgn(tP,s,b) % overloads subsasgn -if ~isa(tP,'tripelPointList'), tP = b([]); end +if ~isa(tP,'triplePointList'), tP = b([]); end switch s(1).type diff --git a/EBSDAnalysis/@tripelPointList/subsref.m b/EBSDAnalysis/@triplePointList/subsref.m similarity index 100% rename from EBSDAnalysis/@tripelPointList/subsref.m rename to EBSDAnalysis/@triplePointList/subsref.m diff --git a/EBSDAnalysis/@tripelPointList/tripelPointList.m b/EBSDAnalysis/@triplePointList/triplePointList.m similarity index 93% rename from EBSDAnalysis/@tripelPointList/tripelPointList.m rename to EBSDAnalysis/@triplePointList/triplePointList.m index 49760c889..ec49f8551 100644 --- a/EBSDAnalysis/@tripelPointList/tripelPointList.m +++ b/EBSDAnalysis/@triplePointList/triplePointList.m @@ -1,4 +1,4 @@ -classdef tripelPointList < phaseList & dynProp +classdef triplePointList < phaseList & dynProp % grainBoundary list of grain boundaries in 2-D % % grainBoundary is used to extract, analyze and visualize grain @@ -25,7 +25,7 @@ end methods - function tP = tripelPointList(id,V,grainId,boundaryId,phaseId,phaseMap,CSList) + function tP = triplePointList(id,V,grainId,boundaryId,phaseId,phaseMap,CSList) if nargin == 0, return; end diff --git a/doc/BoundaryAnalysis/BoundaryAnalysis.toc b/doc/BoundaryAnalysis/BoundaryAnalysis.toc index ae37bb540..d231de6d1 100644 --- a/doc/BoundaryAnalysis/BoundaryAnalysis.toc +++ b/doc/BoundaryAnalysis/BoundaryAnalysis.toc @@ -1,4 +1,4 @@ BoundaryPlots TwinningAnalysis CSLBoundaries -TripelPoints \ No newline at end of file +TriplePoints \ No newline at end of file diff --git a/doc/BoundaryAnalysis/TripelPoints.m b/doc/BoundaryAnalysis/TriplePoints.m similarity index 57% rename from doc/BoundaryAnalysis/TripelPoints.m rename to doc/BoundaryAnalysis/TriplePoints.m index 30562ed01..0a182f98e 100644 --- a/doc/BoundaryAnalysis/TripelPoints.m +++ b/doc/BoundaryAnalysis/TriplePoints.m @@ -1,15 +1,15 @@ -%% Tripel points -% how to detect tripel points +%% Triple points +% how to detect triple points % %% Open in Editor % %% Contents -% This is some starting implementation for tripel points in orientation +% This is some starting implementation for triple points in orientation % images. -%% Calculation of tripel points +%% Calculation of triple points % -% MTEX automatically computes tripel points during grain reconstruction. +% MTEX automatically computes triple points during grain reconstruction. % They are acessable similarly to % as an property of the grain list. @@ -19,24 +19,24 @@ % compute grains grains = calcGrains(ebsd('indexed')); -% extract all tripel points -tP = grains.tripelPoints +% extract all triple points +tP = grains.triplePoints -%% Index tripel points by phase +%% Index triple points by phase % -% You may index tripel points by the adjacent phases. The following command -% gives you all tripel points with at least one phase being Forsterite +% You may index triple points by the adjacent phases. The following command +% gives you all triple points with at least one phase being Forsterite tP('Forsterite') %% -% The following command gives you all tripel points with at least two +% The following command gives you all triple points with at least two % phases being Forsterite tP('Forsterite','Forsterite') %% -% Finaly, we may mark all inner Diopside tripel points +% Finaly, we may mark all inner Diopside triple points % smooth the grains a bit grains = smooth(grains,2); @@ -44,23 +44,23 @@ % and plot them plot(grains); -% on top plot the tripel points +% on top plot the triple points hold on plot(tP('Diopside','Diopside','Diopside'),'displayName','Di-Di-Di','color','b') hold off -%% Index tripel points by grains +%% Index triple points by grains % -% Since, tripel points are asociated to grains we may single out tripel +% Since, triple points are asociated to grains we may single out triple % points that belong to a specific grain or some subset of grains. % find the index of the largest grain [~,id] = max(grains.area); -% the tripel points that belong to the largest grain -tP = grains(id).tripelPoints; +% the triple points that belong to the largest grain +tP = grains(id).triplePoints; -% plot these tripel points +% plot these triple points plot(grains(id),'FaceColor',[0.2 0.8 0.8],'displayName','largest grains'); hold on plot(grains.boundary) @@ -68,10 +68,10 @@ hold off -%% Index tripel points by grain boundary +%% Index triple points by grain boundary % -% Tripel points are not only a property of grains but also of grain -% boundaries. Thus we may ask for all tripel points that belong to +% Triple points are not only a property of grains but also of grain +% boundaries. Thus we may ask for all triple points that belong to % Fosterite - Forsterite boundaries with misorientation angle larger then % 60 degree @@ -81,43 +81,43 @@ % Fo - Fo segments with misorientation angle larger 60 degree gB_large = gB_Fo(gB_Fo.misorientation.angle>60*degree) -% plot the tripel points +% plot the triple points plot(grains) hold on plot(gB_large,'linewidth',2,'linecolor','w') -plot(gB_large.tripelPoints,'color','m') +plot(gB_large.triplePoints,'color','m') hold off -%% Boundary segments from tripel points +%% Boundary segments from triple points % % On the other hand we may also ask for the boundary segments that build up -% a tripel point. These are stored as the property boundaryId for each -% tripel points. +% a triple point. These are stored as the property boundaryId for each +% triple points. % -% lets take Forsterite tripel points -tP = grains.tripelPoints('Fo','Fo','Fo'); +% lets take Forsterite triple points +tP = grains.triplePoints('Fo','Fo','Fo'); -% the boundary segments which form the tripel points +% the boundary segments which form the triple points gB = grains.boundary(tP.boundaryId); -% plot the tripel point boundary segments +% plot the triple point boundary segments plot(grains) hold on plot(gB,'lineColor','w','linewidth',2) hold off %% -% Once we have extracted the boundary segments adjecent to a tripel point +% Once we have extracted the boundary segments adjecent to a triple point % we may also extract the corresponding misorientations. The following % command gives a n x 3 list of misorientations where n is the number of -% tripel points +% triple points mori = gB.misorientation %% -% Hence, we can compute for each tripel point the sum of misorientation +% Hence, we can compute for each triple point the sum of misorientation % angles by sumMisAngle = sum(mori.angle,2); diff --git a/doc/ReleaseNotes/changelog.m b/doc/ReleaseNotes/changelog.m index e14c9e88f..b964b2314 100644 --- a/doc/ReleaseNotes/changelog.m +++ b/doc/ReleaseNotes/changelog.m @@ -3,7 +3,7 @@ % %% MTEX 4.2 - 11/2015 % -% MTEX 4.2 introduces basic functionality for tripel junction analysis in +% MTEX 4.2 introduces basic functionality for triple junction analysis in % grain maps. % % *Tripel points* @@ -11,10 +11,10 @@ % Tripel points are automatically computed during grain reconstruction and % can be accessed by % -% grains.tripelPoints -% grains.boundary.tripelPoints +% grains.triplePoints +% grains.boundary.triplePoints % -% More details on how to work with tripel points can be found +% More details on how to work with triple points can be found % . % % *large EBSD data sets* diff --git a/tools/math_tools/allTripel.m b/tools/math_tools/allTriple.m similarity index 61% rename from tools/math_tools/allTripel.m rename to tools/math_tools/allTriple.m index 85f5bf4da..2961284a5 100644 --- a/tools/math_tools/allTripel.m +++ b/tools/math_tools/allTriple.m @@ -1,5 +1,5 @@ -function [x,y,z] = allTripel(d) -% all tripel of elements of x and y modulo permutation +function [x,y,z] = allTriple(d) +% all triple of elements of x and y modulo permutation % [x,y,z] = meshgrid(1:length(d)); From 6195d16cd9bf43a4b3a94766d6ddff8156d26298 Mon Sep 17 00:00:00 2001 From: Ralf Hielscher Date: Thu, 19 Nov 2015 09:15:34 +0100 Subject: [PATCH 2/2] mtex 4.2.1 --- Makefile | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 751f01e48..22f14079a 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ clean: # rule for making release -RNAME = mtex-4.2.0 +RNAME = mtex-4.2.1 RDIR = ../releases release: rm -rf $(RDIR)/$(RNAME)* diff --git a/VERSION b/VERSION index 52a02c291..ac592c860 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -MTEX 4.2.0 +MTEX 4.2.1