From: treecity <treecity@26120e32-c555-405d-b3e1-1f783fb42516>
Date: Sun, 28 Aug 2011 14:58:42 +0000 (+0000)
Subject: [src] weitere Versuche
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=ed62a54abee8202aeeede12ae8ffb1e086ab90f7;p=bacc.git

[src] weitere Versuche

git-svn-id: https://drops.fb12.tu-berlin.de/svn/bacc/trunk@37 26120e32-c555-405d-b3e1-1f783fb42516
---

diff --git a/src/mex_build_As1.cpp b/src/mex_build_As1.cpp
index ec82bee..d54e512 100644
--- a/src/mex_build_As1.cpp
+++ b/src/mex_build_As1.cpp
@@ -13,6 +13,17 @@
 
 using namespace std;
 
+inline int dimOfVec(double * vec)
+{
+	if (vec[2] != 0)
+		return 2;
+	else if (vec[1] != 0)
+		return 1;
+	else
+		return 0;
+}
+
+
 void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
 
 	int i, j, k;
@@ -98,26 +109,13 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
 
 		// Lageeigenschaften des Flaechenstuecks
 		//if(xn[0]*xn[0]+xn[1]*xn[1]<xn[2]*xn[2])
-		if (xn[2] != 0)
-			rx = 2;
-		else if (xn[1] != 0)
-			rx = 1;
-		else
-			rx = 0;
-
-		if (xa[2] != 0)
-			rxa = 2;
-		else if (xa[1] != 0)
-			rxa = 1;
-		else
-			rxa = 0;
-
-		if (xb[2] != 0)
-			rxb = 2;
-		else if (xb[1] != 0)
-			rxb = 1;
-		else
-			rxb = 0;
+
+		rx = dimOfVec(xn);
+
+		rxa = dimOfVec(xa);
+
+		rxb = dimOfVec(xb);
+
 
 		//kleinste Ecke finden und fuer \delta verwenden
 
@@ -173,26 +171,11 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
 			yn[1] = (ya[2]) * (yb[0]) - (ya[0]) * (yb[2]);
 			yn[2] = (ya[0]) * (yb[1]) - (ya[1]) * (yb[0]);
 
-			if (yn[2] != 0)
-				ry = 2;
-			else if (yn[1] != 0)
-				ry = 1;
-			else
-				ry = 0;
-
-			if (ya[2] != 0)
-				rya = 2;
-			else if (ya[1] != 0)
-				rya = 1;
-			else
-				rya = 0;
-
-			if (yb[2] != 0)
-				ryb = 2;
-			else if (yb[1] != 0)
-				ryb = 1;
-			else
-				ryb = 0;
+			ry = dimOfVec(yn);
+
+			rya = dimOfVec(ya);
+
+			ryb = dimOfVec(yb);
 
 			//kleinste Ecke finden und fuer \delta verwenden
 
@@ -219,7 +202,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
 			//		d[i] = y0[i]-x0[i];
 
 
-			if(ry = rx){
+			if(ry == rx){
 
 				if(xa[rxa]*xa[rxa]+xb[rxb]*xb[rxb]>ya[rya]*ya[rya]+yb[ryb]*yb[ryb]){
 
@@ -229,14 +212,11 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
 					printf(" | ");
 */
 
-					printf("(%3.d %3.d)",j,k);
-
 					vtmp = xa; xa = ya; ya = vtmp;
 					vtmp = xb; xb = yb; yb = vtmp;
 
 					itmp = rxa; rxa = rya; rya = itmp;
 					itmp = rxb; rxb = ryb; ryb = itmp;
-
 					itmp = rx; rx = ry; ry = itmp;
 
 					for (i = 0; i<3;++i)
@@ -313,7 +293,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
 		}
 
 	}
-	printf("\n");
+	//printf("\n");
 	//Rueckgabe (eventuell zurueck schreiben)
 	//   mxFree(x0);
 	//mxFree(x1);
diff --git a/src/test_solveErrorS1.m b/src/test_solveErrorS1.m
index 4143f9c..c367bb2 100755
--- a/src/test_solveErrorS1.m
+++ b/src/test_solveErrorS1.m
@@ -1,4 +1,6 @@
 
+mex mex_build_As1.cpp slpRectangle.cpp
+
 dataIso =[];
 dataAniso =[];
 maxSize = 10^2;
@@ -45,11 +47,20 @@ while size(elements,1)<maxSize
   
   %Matrix mit feinem Netz berechnen
   A_fine = mex_build_As1(coordinates_fine,elements_fine);
-  eh = A_fine-mex_build_A(coordinates_fine,elements_fine);
-  figure (3)
+  A2 = mex_build_A(coordinates_fine,elements_fine);
+  
+%   figure(1)
+%   spy(A_fine-A_fine')
+%   
+%   figure (2)
+%   spy(A2-A2')
+  eh = A_fine - A2;
+%   sum(sum(abs(A2-A2')))
+%   sum(sum(abs(A_fine-A_fine')))
+  
   spy(eh)
  
-  sum(sum(eh))
+  sum(sum(abs(eh)))
   if(eh.^2)
     disp 'hä'
   end