From: Peter Schaefer Date: Mon, 6 Aug 2012 14:54:15 +0000 (+0200) Subject: [src] t2str X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=c7d78f904ca68d2811761e2141bd212ebc0275a3;p=bacc.git [src] t2str [src] Datei outputnamen angepasst --- diff --git a/src/A_plots.m b/src/A_plots.m index 626896d..e6e4fc7 100644 --- a/src/A_plots.m +++ b/src/A_plots.m @@ -39,14 +39,19 @@ for i = 1:length(files) X = [X repmat(data(:,1),1,step)]; p1 = find(files{i}=='/',1,'last')+1; - p2 = find(files{i}(p1:end)=='_',1)+p1; + if(isempty(p1)) + p1=1; + end + p2 = find(files{i}(p1:end)=='_',2)+p1-1; + if(length(p2)<2) + p2(2) = length(files{i}); + else + p2(2) = p2(2) -1; + end - p3 = find(files{i}(p2:end)=='_',1)+p2; - - l0 = [files{i}(p2:p3-1) ' ']; -% l0 = ''; - t0 = [files{i}(p1:p2-1) ' ']; + t0 = ['(' files{i}(p2(1)+1:p2(2)) ')']; + l0 = [files{i}(p1:p2(1)-1) ' ']; l1 = {type2str{data(1,[2+(0:step-1)*rows])}}; for i = 1:step leg0 = {leg0{:}... @@ -69,7 +74,7 @@ for i = 1:length(files) }'; leg3 = {leg3{:}... - ['cond(A_{h/2})' l0 l1{i}]... + ['cond(A_{h/2}) ' l0 l1{i}]... }'; sym = {sym{:} type2sym{data(1,[2+(i-1)*rows])}}'; end diff --git a/src/compute.m b/src/compute.m index 6d2522b..2e69bd7 100644 --- a/src/compute.m +++ b/src/compute.m @@ -1,4 +1,4 @@ -function [data er] = compute(file,times,zeta,type,theta,nu,vcon,out) +function [data er fileo] = compute(file,times,zeta,type,theta,nu,vcon) % [data er] = compute(file,times,zeta,type,theta,nu,vcon,out) % Führt times Verfeinerungsschritte aus % @@ -46,7 +46,7 @@ for j = 1:times %Alle MatrixBrechenungsArten mit dem selben Netz berechnen for i = 1:length(type) - disp (size(elements,1)) + disp([num2str(size(elements,1)) ' : ' t2str(toc) ' ->' num2str(i)]) %Matrix aufbauen -> MEX V_fine = mex_build_V(coo_fine,ele_fine,zeta,type(i)); @@ -240,17 +240,29 @@ for j = 1:times % plotShape(G_C,G_E,''); % plotMark(er,G_C,G_E); % end - + + p1 = find(file=='/',1,'last')+1; + if(isempty(p1)) + p1=1; + end + + p2 = find(file(p1:end)=='_',2)+p1; + if(length(p2)<2) + p2(2) = length(file); + else + p2(2) = p2(2) -2; + end + + + %ErgebnisWerte Speichern data(size(data,1)+1,1:length(dataS)) = dataS; typeN = int2str(type); - save (['meshSave/'... - out... - file(find(file =='_')+1:end) '_'... - typeN(typeN~=' ')... + fileo = [typeN(typeN~=' ')... 't' regexprep(num2str(theta,2),'\.','')... - 'n' regexprep(num2str(nu,2),'\.','')... - '_' int2str(size(data,1))]... + 'n' regexprep(num2str(nu,2),'\.','') '_'... + file(p2(1):p2(2)) '_']; + save (['meshSave/' fileo int2str(size(data,1))]... , 'coordinates', 'elements','neigh','data', 'sites') %Alle Relevanten zwischenInformationen Speichern @@ -279,3 +291,19 @@ end % = hmin(T) * ( ||phi_{h/2}||^2_{L2(T)} - ||Pi_h % phi_{h/2}||^2_{L2(T)} + +function str = t2str(time) + type = 's'; + + if(time/60>1) + time = time/60; + type = 'm'; + + if(time/60>1) + time = time/60; + type = 'h'; + end + end + +str = [num2str(round(time*1000)/1000) type]; +end \ No newline at end of file diff --git a/src/slpRectangle.cpp b/src/slpRectangle.cpp index dfe6e28..96543d0 100644 --- a/src/slpRectangle.cpp +++ b/src/slpRectangle.cpp @@ -544,7 +544,8 @@ double cParO3(double b, double d, double t, double v, double d1, double d2, switch_dim(b, d, t, v, d1, d2); if ((b * b + d * d) <= zeta[1] * dist2(b, d, t, v, d1, d2, d3)) - if (max(b,t) <= zeta[2] * min(d,v)) + if ((max(b, t) <= zeta[2] * min(d, v)) + && (min(dist_s2(b, t, d1), dist_s2(d, v, d2)) > 0)) // mexPrintf("Qx1x2"); return calcParIntQY1X1(b, d, t, v, d1, d2, d3); diff --git a/src/t2str.m b/src/t2str.m new file mode 100644 index 0000000..e61ed9f --- /dev/null +++ b/src/t2str.m @@ -0,0 +1,15 @@ +function str = t2str(time) + type = 's'; + + if(time/60>1) + time = time/60; + type = 'm'; + + if(time/60>1) + time = time/60; + type = 'h'; + end + end + +str = [num2str(round(time*1000)/1000) type]; +end \ No newline at end of file diff --git a/src/test_sol.m b/src/test_sol.m index 6c80f51..ed26ca5 100644 --- a/src/test_sol.m +++ b/src/test_sol.m @@ -9,10 +9,10 @@ mex mex_build_V.cpp slpRectangle.cpp CFLAGS="\$CFLAGS -fopenmp" CXXFLAGS="\$CXXF % Test ausführen %Anzahl der Schritte -steps = 10; +steps = 40; %Art der Berechnungen -type = [1 2]; +type = [1 3]; zeta = [1 1 2]; @@ -24,21 +24,14 @@ theta = 0.5; %Anisotrop nu = 0.5; tic -compute(file, steps, zeta, type, theta, nu, 0, 'ts') +[a b fileo]=compute(file, steps, zeta, type, theta, nu, 0); + time = toc typeN = int2str(type); -A_plots({['meshSave/'... - 'ts'... - file(find(file =='_')+1:end) '_'... - typeN(typeN~=' ')... - 't' regexprep(num2str(theta,2),'\.','')... - 'n' regexprep(num2str(nu,2),'\.','')... - '_' int2str(steps)]},['ts'... - file(find(file =='_')+1:end) '_'... - typeN(typeN~=' ')... - 't' regexprep(num2str(theta,2),'\.','')... - 'n' regexprep(num2str(nu,2),'\.','')... - '_' int2str(steps)]); + +A_plots({['meshSave/' fileo int2str(steps)]},... + [fileo ... + int2str(steps)]); %% BLa bla % compute('exmpl_2DQuad', steps, zeta, type, 0.5, 0.5, 1, 'tsAAvcon_') diff --git a/src/ts2DQuad_12t05n05_30_cond.eps b/src/ts2DQuad_12t05n05_30_cond.eps index 880bf63..41be582 100644 --- a/src/ts2DQuad_12t05n05_30_cond.eps +++ b/src/ts2DQuad_12t05n05_30_cond.eps @@ -1,12 +1,12 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-27-generic #43-Ubuntu SMP Fri Jul 6 14:25:57 UTC 2012 x86_64. %%Title: ./ts2DQuad_12t05n05_30_cond.eps -%%CreationDate: 08/06/2012 15:16:41 +%%CreationDate: 08/06/2012 15:56:40 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK %%Pages: 1 -%%BoundingBox: 53 195 550 607 +%%BoundingBox: 53 195 550 602 %%EndComments %%BeginProlog @@ -158,7 +158,7 @@ end %%Page: 1 1 %%BeginPageSetup -%%PageBoundingBox: 53 195 550 607 +%%PageBoundingBox: 53 195 550 602 MathWorks begin bpage %%EndPageSetup @@ -169,7 +169,7 @@ bplot /dpi2point 8.33333 def portraitMode 0150 5100 csm - 296 41 4143 3426 MR c np + 296 79 4143 3388 MR c np 85 dict begin %Colortable dictionary /c0 { 0.000000 0.000000 0.000000 sr} bdef /c1 { 1.000000 1.000000 1.000000 sr} bdef @@ -711,16 +711,8 @@ gr %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -1726 168 mt -(KonditionierungsZahlen von V ts2DQuad) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -3227 209 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - +1718 206 mt +(KonditionierungsZahlen von V \(12t05n05\)) s 2307 3432 mt (Elemente) s 390 1915 mt -90 rotate @@ -731,77 +723,57 @@ gr 4333 300 mt ( ) s 1 sg -0 308 1214 0 0 -308 665 620 4 MP +0 308 1246 0 0 -308 665 620 4 MP PP --1214 0 0 308 1214 0 0 -308 665 620 5 MP stroke +-1246 0 0 308 1246 0 0 -308 665 620 5 MP stroke 2.77778 w DO SO 4.16667 w 0 sg - 665 620 mt 1879 620 L + 665 620 mt 1911 620 L 665 620 mt 665 312 L - 993 392 mt +1002 392 mt (cond\(A) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 66.6667 FMSR -1257 433 mt +1266 433 mt (h/2) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -1349 392 mt -(\)12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1724 433 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1742 392 mt -(A) s -gs 665 312 1215 309 MR c np +1358 392 mt +(\)ts2DQuad A) s +gs 665 312 1247 309 MR c np c8 -252 0 715 396 2 MP stroke -gs 790 345 103 103 MR c np - 25 25 841 396 FO +259 0 716 396 2 MP stroke +gs 795 345 103 103 MR c np + 25 25 846 396 FO gr gr c8 0 sg - 993 533 mt +1002 533 mt (cond\(A) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 66.6667 FMSR -1257 574 mt +1266 574 mt (h/2) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -1349 533 mt -(\)12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1724 574 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1742 533 mt -(QA) s -gs 665 312 1215 309 MR c np +1358 533 mt +(\)ts2DQuad QA) s +gs 665 312 1247 309 MR c np c8 -252 0 715 535 2 MP stroke -gs 790 484 103 103 MR c np - 824 518 mt 858 552 L - 858 518 mt 824 552 L +259 0 716 535 2 MP stroke +gs 795 484 103 103 MR c np + 829 518 mt 863 552 L + 863 518 mt 829 552 L gr gr diff --git a/src/ts2DQuad_12t05n05_30_error.eps b/src/ts2DQuad_12t05n05_30_error.eps index b30c4c4..ce4cca0 100644 --- a/src/ts2DQuad_12t05n05_30_error.eps +++ b/src/ts2DQuad_12t05n05_30_error.eps @@ -1,12 +1,12 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-27-generic #43-Ubuntu SMP Fri Jul 6 14:25:57 UTC 2012 x86_64. %%Title: ./ts2DQuad_12t05n05_30_error.eps -%%CreationDate: 08/06/2012 15:16:39 +%%CreationDate: 08/06/2012 15:56:39 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK %%Pages: 1 -%%BoundingBox: 53 195 550 607 +%%BoundingBox: 53 195 550 602 %%EndComments %%BeginProlog @@ -158,7 +158,7 @@ end %%Page: 1 1 %%BeginPageSetup -%%PageBoundingBox: 53 195 550 607 +%%PageBoundingBox: 53 195 550 602 MathWorks begin bpage %%EndPageSetup @@ -169,7 +169,7 @@ bplot /dpi2point 8.33333 def portraitMode 0150 5100 csm - 294 41 4145 3426 MR c np + 294 79 4145 3388 MR c np 85 dict begin %Colortable dictionary /c0 { 0.000000 0.000000 0.000000 sr} bdef /c1 { 1.000000 1.000000 1.000000 sr} bdef @@ -816,16 +816,8 @@ DD %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -2160 168 mt -(Fehler ts2DQuad) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -2792 209 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - +2153 206 mt +(Fehler \(12t05n05\)) s 2307 3432 mt (Elemente) s 388 1926 mt -90 rotate @@ -837,43 +829,33 @@ DD ( ) s SO 1 sg -0 1274 1063 0 0 -1274 665 3166 4 MP +0 1070 1099 0 0 -1070 665 3166 4 MP PP --1063 0 0 1274 1063 0 0 -1274 665 3166 5 MP stroke +-1099 0 0 1070 1099 0 0 -1070 665 3166 5 MP stroke 2.77778 w DO SO 4.16667 w 0 sg - 665 3166 mt 1728 3166 L - 665 3166 mt 665 1892 L - 984 1967 mt + 665 3166 mt 1764 3166 L + 665 3166 mt 665 2096 L + 995 2192 mt (t) s %%IncludeResource: font Symbol /Symbol /ISOLatin1Encoding 83.3333 FMSR -1007 1967 mt +1018 2192 mt (m) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -1055 1967 mt -( 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1425 2008 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1443 1967 mt -(A) s -gs 665 1892 1064 1275 MR c np +1066 2192 mt +( ts2DQuad A) s +gs 665 2096 1100 1071 MR c np c8 -245 0 714 1975 2 MP stroke -gs 785 1924 103 103 MR c np - 25 25 836 1975 FO +254 0 715 2161 2 MP stroke +gs 791 2110 103 103 MR c np + 25 25 842 2161 FO gr gr @@ -883,85 +865,55 @@ c8 %%IncludeResource: font Symbol /Symbol /ISOLatin1Encoding 83.3333 FMSR - 984 2106 mt + 995 2294 mt (h) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -1034 2106 mt -( 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1404 2147 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1422 2106 mt -(A) s -gs 665 1892 1064 1275 MR c np +1045 2294 mt +( ts2DQuad A) s +gs 665 2096 1100 1071 MR c np c9 -245 0 714 2113 2 MP stroke -gs 785 2062 103 103 MR c np - 25 25 836 2113 FO +254 0 715 2264 2 MP stroke +gs 791 2213 103 103 MR c np + 25 25 842 2264 FO gr gr c9 0 sg - 984 2248 mt -(fehler 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1560 2289 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1578 2248 mt -(A) s -gs 665 1892 1064 1275 MR c np + 995 2397 mt +(fehler ts2DQuad A) s +gs 665 2096 1100 1071 MR c np c10 -245 0 714 2252 2 MP stroke -gs 785 2201 103 103 MR c np - 25 25 836 2252 FO +254 0 715 2366 2 MP stroke +gs 791 2315 103 103 MR c np + 25 25 842 2366 FO gr gr c10 0 sg - 984 2383 mt + 995 2500 mt (t) s %%IncludeResource: font Symbol /Symbol /ISOLatin1Encoding 83.3333 FMSR -1007 2383 mt +1018 2500 mt (m) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -1055 2383 mt -( 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1425 2424 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1443 2383 mt -(QA) s -gs 665 1892 1064 1275 MR c np +1066 2500 mt +( ts2DQuad QA) s +gs 665 2096 1100 1071 MR c np c8 -245 0 714 2390 2 MP stroke -gs 785 2339 103 103 MR c np - 819 2373 mt 853 2407 L - 853 2373 mt 819 2407 L +254 0 715 2469 2 MP stroke +gs 791 2418 103 103 MR c np + 825 2452 mt 859 2486 L + 859 2452 mt 825 2486 L gr gr @@ -971,70 +923,50 @@ c8 %%IncludeResource: font Symbol /Symbol /ISOLatin1Encoding 83.3333 FMSR - 984 2522 mt + 995 2602 mt (h) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -1034 2522 mt -( 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1404 2563 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1422 2522 mt -(QA) s -gs 665 1892 1064 1275 MR c np +1045 2602 mt +( ts2DQuad QA) s +gs 665 2096 1100 1071 MR c np c9 -245 0 714 2529 2 MP stroke -gs 785 2478 103 103 MR c np - 819 2512 mt 853 2546 L - 853 2512 mt 819 2546 L +254 0 715 2571 2 MP stroke +gs 791 2520 103 103 MR c np + 825 2554 mt 859 2588 L + 859 2554 mt 825 2588 L gr gr c9 0 sg - 984 2664 mt -(fehler 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1560 2705 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1578 2664 mt -(QA) s -gs 665 1892 1064 1275 MR c np + 995 2705 mt +(fehler ts2DQuad QA) s +gs 665 2096 1100 1071 MR c np c10 -245 0 714 2667 2 MP stroke -gs 785 2616 103 103 MR c np - 819 2650 mt 853 2684 L - 853 2650 mt 819 2684 L +254 0 715 2674 2 MP stroke +gs 791 2623 103 103 MR c np + 825 2657 mt 859 2691 L + 859 2657 mt 825 2691 L gr gr c10 0 sg - 984 2847 mt + 995 2837 mt (N) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 66.6667 FMSR -1044 2806 mt +1055 2796 mt (-1/2) s -gs 665 1892 1064 1275 MR c np +gs 665 2096 1100 1071 MR c np DD c8 -245 0 714 2805 2 MP stroke +254 0 715 2796 2 MP stroke SO gr @@ -1043,17 +975,17 @@ c8 %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR - 984 2985 mt + 995 2979 mt (N) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 66.6667 FMSR -1044 2944 mt +1055 2938 mt (-1/4) s -gs 665 1892 1064 1275 MR c np +gs 665 2096 1100 1071 MR c np DD c9 -245 0 714 2944 2 MP stroke +254 0 715 2938 2 MP stroke SO gr @@ -1062,17 +994,17 @@ c9 %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR - 984 3124 mt + 995 3122 mt (N) s %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 66.6667 FMSR -1044 3083 mt +1055 3081 mt (-3/4) s -gs 665 1892 1064 1275 MR c np +gs 665 2096 1100 1071 MR c np DD c10 -245 0 714 3082 2 MP stroke +254 0 715 3080 2 MP stroke SO gr diff --git a/src/ts2DQuad_12t05n05_30_hminmax.eps b/src/ts2DQuad_12t05n05_30_hminmax.eps index 33741b7..4307995 100644 --- a/src/ts2DQuad_12t05n05_30_hminmax.eps +++ b/src/ts2DQuad_12t05n05_30_hminmax.eps @@ -1,12 +1,12 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-27-generic #43-Ubuntu SMP Fri Jul 6 14:25:57 UTC 2012 x86_64. %%Title: ./ts2DQuad_12t05n05_30_hminmax.eps -%%CreationDate: 08/06/2012 15:16:40 +%%CreationDate: 08/06/2012 15:56:39 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK %%Pages: 1 -%%BoundingBox: 53 195 550 607 +%%BoundingBox: 53 195 550 602 %%EndComments %%BeginProlog @@ -158,7 +158,7 @@ end %%Page: 1 1 %%BeginPageSetup -%%PageBoundingBox: 53 195 550 607 +%%PageBoundingBox: 53 195 550 602 MathWorks begin bpage %%EndPageSetup @@ -169,7 +169,7 @@ bplot /dpi2point 8.33333 def portraitMode 0150 5100 csm - 294 41 4145 3426 MR c np + 294 79 4145 3388 MR c np 85 dict begin %Colortable dictionary /c0 { 0.000000 0.000000 0.000000 sr} bdef /c1 { 1.000000 1.000000 1.000000 sr} bdef @@ -912,16 +912,8 @@ gr %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -2074 168 mt -(hmin hmax ts2DQuad) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -2879 209 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - +2066 206 mt +(hmin hmax \(12t05n05\)) s 2307 3432 mt (Elemente) s 388 1926 mt -90 rotate @@ -932,151 +924,91 @@ gr 4333 300 mt ( ) s 1 sg -0 864 1619 0 0 -864 665 3166 4 MP +0 636 1662 0 0 -636 665 3166 4 MP PP --1619 0 0 864 1619 0 0 -864 665 3166 5 MP stroke +-1662 0 0 636 1662 0 0 -636 665 3166 5 MP stroke 2.77778 w DO SO 4.16667 w 0 sg - 665 3166 mt 2284 3166 L - 665 3166 mt 665 2302 L -1011 2382 mt -(min hmin/max hmax 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -2127 2423 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -2145 2382 mt -(A) s -gs 665 2302 1620 865 MR c np + 665 3166 mt 2327 3166 L + 665 3166 mt 665 2530 L +1020 2625 mt +(min hmin/max hmax ts2DQuad A) s +gs 665 2530 1663 637 MR c np c8 -265 0 718 2385 2 MP stroke -gs 799 2334 103 103 MR c np - 25 25 850 2385 FO +273 0 719 2594 2 MP stroke +gs 804 2543 103 103 MR c np + 25 25 855 2594 FO gr gr c8 0 sg -1011 2521 mt -(min hmax/max hmax 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -2150 2562 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -2168 2521 mt -(A) s -gs 665 2302 1620 865 MR c np +1020 2726 mt +(min hmax/max hmax ts2DQuad A) s +gs 665 2530 1663 637 MR c np c9 -265 0 718 2525 2 MP stroke -gs 799 2474 103 103 MR c np - 25 25 850 2525 FO +273 0 719 2696 2 MP stroke +gs 804 2645 103 103 MR c np + 25 25 855 2696 FO gr gr c9 0 sg -1011 2661 mt -(min hmin/hmax 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1946 2702 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1964 2661 mt -(A) s -gs 665 2302 1620 865 MR c np +1020 2828 mt +(min hmin/hmax ts2DQuad A) s +gs 665 2530 1663 637 MR c np c10 -265 0 718 2664 2 MP stroke -gs 799 2613 103 103 MR c np - 25 25 850 2664 FO +273 0 719 2797 2 MP stroke +gs 804 2746 103 103 MR c np + 25 25 855 2797 FO gr gr c10 0 sg -1011 2800 mt -(min hmin/max hmax 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -2127 2841 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -2145 2800 mt -(QA) s -gs 665 2302 1620 865 MR c np +1020 2929 mt +(min hmin/max hmax ts2DQuad QA) s +gs 665 2530 1663 637 MR c np c8 -265 0 718 2803 2 MP stroke -gs 799 2752 103 103 MR c np - 833 2786 mt 867 2820 L - 867 2786 mt 833 2820 L +273 0 719 2898 2 MP stroke +gs 804 2847 103 103 MR c np + 838 2881 mt 872 2915 L + 872 2881 mt 838 2915 L gr gr c8 0 sg -1011 2940 mt -(min hmax/max hmax 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -2150 2981 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -2168 2940 mt -(QA) s -gs 665 2302 1620 865 MR c np +1020 3031 mt +(min hmax/max hmax ts2DQuad QA) s +gs 665 2530 1663 637 MR c np c9 -265 0 718 2942 2 MP stroke -gs 799 2891 103 103 MR c np - 833 2925 mt 867 2959 L - 867 2925 mt 833 2959 L +273 0 719 2999 2 MP stroke +gs 804 2948 103 103 MR c np + 838 2982 mt 872 3016 L + 872 2982 mt 838 3016 L gr gr c9 0 sg -1011 3079 mt -(min hmin/hmax 12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -1946 3120 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -1964 3079 mt -(QA) s -gs 665 2302 1620 865 MR c np +1020 3132 mt +(min hmin/hmax ts2DQuad QA) s +gs 665 2530 1663 637 MR c np c10 -265 0 718 3082 2 MP stroke -gs 799 3031 103 103 MR c np - 833 3065 mt 867 3099 L - 867 3065 mt 833 3099 L +273 0 719 3101 2 MP stroke +gs 804 3050 103 103 MR c np + 838 3084 mt 872 3118 L + 872 3084 mt 838 3118 L gr gr diff --git a/src/ts2DQuad_12t05n05_30_norm.eps b/src/ts2DQuad_12t05n05_30_norm.eps index cd09f3e..4f03f94 100644 --- a/src/ts2DQuad_12t05n05_30_norm.eps +++ b/src/ts2DQuad_12t05n05_30_norm.eps @@ -1,12 +1,12 @@ %!PS-Adobe-2.0 EPSF-1.2 %%Creator: MATLAB, The MathWorks, Inc. Version 7.14.0.739 (R2012a). Operating System: Linux 3.2.0-27-generic #43-Ubuntu SMP Fri Jul 6 14:25:57 UTC 2012 x86_64. %%Title: ./ts2DQuad_12t05n05_30_norm.eps -%%CreationDate: 08/06/2012 15:16:40 +%%CreationDate: 08/06/2012 15:56:39 %%DocumentNeededFonts: Helvetica %%DocumentProcessColors: Cyan Magenta Yellow Black %%Extensions: CMYK %%Pages: 1 -%%BoundingBox: 44 196 550 607 +%%BoundingBox: 44 196 550 602 %%EndComments %%BeginProlog @@ -158,7 +158,7 @@ end %%Page: 1 1 %%BeginPageSetup -%%PageBoundingBox: 44 196 550 607 +%%PageBoundingBox: 44 196 550 602 MathWorks begin bpage %%EndPageSetup @@ -169,7 +169,7 @@ bplot /dpi2point 8.33333 def portraitMode 0150 5100 csm - 223 40 4216 3426 MR c np + 223 78 4216 3388 MR c np 85 dict begin %Colortable dictionary /c0 { 0.000000 0.000000 0.000000 sr} bdef /c1 { 1.000000 1.000000 1.000000 sr} bdef @@ -603,16 +603,8 @@ DD %%IncludeResource: font Helvetica /Helvetica /ISOLatin1Encoding 83.3333 FMSR -2022 167 mt -(Energie Norm ts2DQuad) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -2936 208 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - +2012 205 mt +(Energie Norm \(12t05n05\)) s 2307 3431 mt (Elemente) s 343 1881 mt -90 rotate @@ -633,77 +625,57 @@ DD ( ) s SO 1 sg -0 409 834 0 0 -409 3469 3165 4 MP +0 333 870 0 0 -333 3433 3165 4 MP PP --834 0 0 409 834 0 0 -409 3469 3165 5 MP stroke +-870 0 0 333 870 0 0 -333 3433 3165 5 MP stroke 2.77778 w DO SO 4.16667 w 0 sg -3469 3165 mt 4303 3165 L -3469 2756 mt 4303 2756 L -3469 3165 mt 3469 2756 L -4303 3165 mt 4303 2756 L -3469 3165 mt 4303 3165 L -3469 3165 mt 3469 2756 L -3469 3165 mt 4303 3165 L -3469 2756 mt 4303 2756 L -3469 3165 mt 3469 2756 L -4303 3165 mt 4303 2756 L -3791 2836 mt -(12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -4138 2877 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -4156 2836 mt -(A) s -gs 3469 2756 835 410 MR c np +3433 3165 mt 4303 3165 L +3433 2832 mt 4303 2832 L +3433 3165 mt 3433 2832 L +4303 3165 mt 4303 2832 L +3433 3165 mt 4303 3165 L +3433 3165 mt 3433 2832 L +3433 3165 mt 4303 3165 L +3433 2832 mt 4303 2832 L +3433 3165 mt 3433 2832 L +4303 3165 mt 4303 2832 L +3769 2927 mt +(ts2DQuad A) s +gs 3433 2832 871 334 MR c np c8 -247 0 3518 2840 2 MP stroke -gs 3591 2789 103 103 MR c np - 25 25 3642 2840 FO +258 0 3484 2896 2 MP stroke +gs 3562 2845 103 103 MR c np + 25 25 3613 2896 FO gr gr c8 0 sg -3791 2976 mt -(12t05n05) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 66.6667 FMSR - -4138 3017 mt -( ) s -%%IncludeResource: font Helvetica -/Helvetica /ISOLatin1Encoding 83.3333 FMSR - -4156 2976 mt -(QA) s -gs 3469 2756 835 410 MR c np +3769 3029 mt +(ts2DQuad QA) s +gs 3433 2832 871 334 MR c np c8 -247 0 3518 2979 2 MP stroke -gs 3591 2928 103 103 MR c np -3625 2962 mt 3659 2996 L -3659 2962 mt 3625 2996 L +258 0 3484 2998 2 MP stroke +gs 3562 2947 103 103 MR c np +3596 2981 mt 3630 3015 L +3630 2981 mt 3596 3015 L gr gr c8 0 sg -3791 3131 mt +3769 3131 mt (extrapoliert) s -gs 3469 2756 835 410 MR c np +gs 3433 2832 871 334 MR c np DD c9 -247 0 3518 3100 2 MP stroke +258 0 3484 3100 2 MP stroke SO gr