5

[psychlops/silverlight.git] / dev4 / psychlops / extention / math / solver.cs

diff --git a/dev4/psychlops/extention/math/solver.cs b/dev4/psychlops/extention/math/solver.cs
index 0a149ec..8ff2b38 100644 (file)
--- a/dev4/psychlops/extention/math/solver.cs
+++ b/dev4/psychlops/extention/math/solver.cs
@@ -146,7 +146,7 @@ namespace Psychlops
                                double like = 1.0;\r
                                champ_like=0.0;\r
                                int L = data.length;\r
-                               for (double a = itvl[0].begin.val; a < itvl[0].end.val; a += step[0])\r
+                               for (double a = itvl[0].begin.value; a < itvl[0].end.value; a += step[0])\r
                                {\r
                                        like = 1.0;\r
                                        for(int i=0; i<L; i++) {\r
@@ -167,9 +167,9 @@ namespace Psychlops
                                double like = 1.0;\r
                                champ_like = 0.0;\r
                                int L = data.length;\r
-                               for (double a = itvl[0].begin.val; a < itvl[0].end.val; a += step[0])\r
+                               for (double a = itvl[0].begin.value; a < itvl[0].end.value; a += step[0])\r
                                {\r
-                                       for (double b = itvl[1].begin.val; b < itvl[1].end.val; b += step[1])\r
+                                       for (double b = itvl[1].begin.value; b < itvl[1].end.value; b += step[1])\r
                                        {\r
                                                like = 1.0;\r
                                                for (int i = 0; i < L; i++)\r
@@ -194,11 +194,11 @@ namespace Psychlops
                                double like = 1.0;\r
                                champ_like = 0.0;\r
                                int L = data.length;\r
-                               for (double a = itvl[0].begin.val; a < itvl[0].end.val; a += step[0])\r
+                               for (double a = itvl[0].begin.value; a < itvl[0].end.value; a += step[0])\r
                                {\r
-                                       for (double b = itvl[1].begin.val; b < itvl[1].end.val; b += step[1])\r
+                                       for (double b = itvl[1].begin.value; b < itvl[1].end.value; b += step[1])\r
                                        {\r
-                                               for (double c = itvl[2].begin.val; c < itvl[2].end.val; c += step[2])\r
+                                               for (double c = itvl[2].begin.value; c < itvl[2].end.value; c += step[2])\r
                                                {\r
                                                        like = 1.0;\r
                                                        for (int i = 0; i < L; i++)\r
@@ -234,6 +234,7 @@ namespace Psychlops
 \r
                public class BinomialLikelihood\r
                {\r
+                       /*\r
                        public static void showWindow(Constants.Func1 f)\r
                        {\r
                                Main.canvas.api_canvas.Dispatcher.BeginInvoke(new Action<Constants.Func1>(showWindow_), f);\r
@@ -261,6 +262,7 @@ namespace Psychlops
                                System.Windows.Controls.ChildWindow page = new PsychlopsSilverlight4.Pages.BinomialSolver(f);\r
                                page.Show();\r
                        }\r
+                       */\r
 \r
                        public int iteration;\r
 \r
@@ -361,10 +363,10 @@ namespace Psychlops
                                        data.elems[i].comb = (int)Binomial.combination(data.elems[i].pos + data.elems[i].neg, data.elems[i].pos);\r
                                }\r
 \r
-                               for (int j = 0; j < Constants.LIMIT; j++) { step[j] = (itvl[j].end.val - itvl[j].begin.val) / 256.0; }\r
+                               for (int j = 0; j < Constants.LIMIT; j++) { step[j] = (itvl[j].end.value - itvl[j].begin.value) / 256.0; }\r
                                for (int i = 0; i < 4; i++)\r
                                {\r
-                                       l[i].itvl[0] = new Interval((itvl[0].begin.val) + (i * step[0] * 64), (itvl[0].begin.val) + ((i + 1) * step[0] * 64));\r
+                                       l[i].itvl[0] = new Interval((itvl[0].begin.value) + (i * step[0] * 64), (itvl[0].begin.value) + ((i + 1) * step[0] * 64));\r
                                        l[i].step[0] = step[0];\r
                                        for (int j = 1; j < Constants.LIMIT; j++)\r
                                        {\r
@@ -392,9 +394,9 @@ namespace Psychlops
                                double r, low, high;\r
                                for (int j = 0; j < Constants.LIMIT; j++)\r
                                {\r
-                                       r = itvl[j].end.val - itvl[j].begin.val;\r
-                                       low = champ[j] - r / 8.0 < itvl[j].begin.val ? itvl[j].begin.val : champ[j] - r / 8.0;\r
-                                       high = champ[j] + r / 8.0 > itvl[j].end.val ? itvl[j].end.val : champ[j] + r / 8.0;\r
+                                       r = itvl[j].end.value - itvl[j].begin.value;\r
+                                       low = champ[j] - r / 8.0 < itvl[j].begin.value ? itvl[j].begin.value : champ[j] - r / 8.0;\r
+                                       high = champ[j] + r / 8.0 > itvl[j].end.value ? itvl[j].end.value : champ[j] + r / 8.0;\r
                                        itvl[j] = new Interval(low, high);\r
                                }\r
 \r