X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=dev4%2Fpsychlops%2Fextention%2Fmath%2Fsolver.cs;fp=dev4%2Fpsychlops%2Fextention%2Fmath%2Fsolver.cs;h=2bca11125712900aa0e463eeb3b242a57d3b8afd;hb=70d45b57ef59585bb8b82123d054014255d260ca;hp=0a149ec0a986b9735fea81ccfeb0d5969688b904;hpb=c37e9a5c4af3c1917504ba88864ebcd6c536a0d5;p=psychlops%2Fsilverlight.git

diff --git a/dev4/psychlops/extention/math/solver.cs b/dev4/psychlops/extention/math/solver.cs
index 0a149ec..2bca111 100644
--- a/dev4/psychlops/extention/math/solver.cs
+++ b/dev4/psychlops/extention/math/solver.cs
@@ -146,7 +146,7 @@ namespace Psychlops
 				double like = 1.0;
 				champ_like=0.0;
 				int L = data.length;
-				for (double a = itvl[0].begin.val; a < itvl[0].end.val; a += step[0])
+				for (double a = itvl[0].begin.value; a < itvl[0].end.value; a += step[0])
 				{
 					like = 1.0;
 					for(int i=0; i<L; i++) {
@@ -167,9 +167,9 @@ namespace Psychlops
 				double like = 1.0;
 				champ_like = 0.0;
 				int L = data.length;
-				for (double a = itvl[0].begin.val; a < itvl[0].end.val; a += step[0])
+				for (double a = itvl[0].begin.value; a < itvl[0].end.value; a += step[0])
 				{
-					for (double b = itvl[1].begin.val; b < itvl[1].end.val; b += step[1])
+					for (double b = itvl[1].begin.value; b < itvl[1].end.value; b += step[1])
 					{
 						like = 1.0;
 						for (int i = 0; i < L; i++)
@@ -194,11 +194,11 @@ namespace Psychlops
 				double like = 1.0;
 				champ_like = 0.0;
 				int L = data.length;
-				for (double a = itvl[0].begin.val; a < itvl[0].end.val; a += step[0])
+				for (double a = itvl[0].begin.value; a < itvl[0].end.value; a += step[0])
 				{
-					for (double b = itvl[1].begin.val; b < itvl[1].end.val; b += step[1])
+					for (double b = itvl[1].begin.value; b < itvl[1].end.value; b += step[1])
 					{
-						for (double c = itvl[2].begin.val; c < itvl[2].end.val; c += step[2])
+						for (double c = itvl[2].begin.value; c < itvl[2].end.value; c += step[2])
 						{
 							like = 1.0;
 							for (int i = 0; i < L; i++)
@@ -361,10 +361,10 @@ namespace Psychlops
 					data.elems[i].comb = (int)Binomial.combination(data.elems[i].pos + data.elems[i].neg, data.elems[i].pos);
 				}
 
-				for (int j = 0; j < Constants.LIMIT; j++) { step[j] = (itvl[j].end.val - itvl[j].begin.val) / 256.0; }
+				for (int j = 0; j < Constants.LIMIT; j++) { step[j] = (itvl[j].end.value - itvl[j].begin.value) / 256.0; }
 				for (int i = 0; i < 4; i++)
 				{
-					l[i].itvl[0] = new Interval((itvl[0].begin.val) + (i * step[0] * 64), (itvl[0].begin.val) + ((i + 1) * step[0] * 64));
+					l[i].itvl[0] = new Interval((itvl[0].begin.value) + (i * step[0] * 64), (itvl[0].begin.value) + ((i + 1) * step[0] * 64));
 					l[i].step[0] = step[0];
 					for (int j = 1; j < Constants.LIMIT; j++)
 					{
@@ -392,9 +392,9 @@ namespace Psychlops
 				double r, low, high;
 				for (int j = 0; j < Constants.LIMIT; j++)
 				{
-					r = itvl[j].end.val - itvl[j].begin.val;
-					low = champ[j] - r / 8.0 < itvl[j].begin.val ? itvl[j].begin.val : champ[j] - r / 8.0;
-					high = champ[j] + r / 8.0 > itvl[j].end.val ? itvl[j].end.val : champ[j] + r / 8.0;
+					r = itvl[j].end.value - itvl[j].begin.value;
+					low = champ[j] - r / 8.0 < itvl[j].begin.value ? itvl[j].begin.value : champ[j] - r / 8.0;
+					high = champ[j] + r / 8.0 > itvl[j].end.value ? itvl[j].end.value : champ[j] + r / 8.0;
 					itvl[j] = new Interval(low, high);
 				}