From: unknown <hskwk@.(none)>
Date: Tue, 24 Aug 2010 03:47:41 +0000 (+0900)
Subject: 132132
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=7b907758692783aad332a63a2a4084c0f2e34dcb;hp=60468a6671a33f5f9ec05e5be1c78f48b99f8e6b;p=psychlops%2Fsilverlight.git

132132
---

diff --git a/dev4/Pages/BinomialSolver.xaml b/dev4/Pages/BinomialSolver.xaml
index e08c197..c40603f 100644
--- a/dev4/Pages/BinomialSolver.xaml
+++ b/dev4/Pages/BinomialSolver.xaml
@@ -3,7 +3,7 @@
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
            xmlns:sdk="http://schemas.microsoft.com/winfx/2006/xaml/presentation/sdk"
            xmlns:controls="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls"
-           Width="400" Height="300" 
+           Width="420" Height="300" 
            Title="Binomial Likelihood Solver" xmlns:toolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit">
 
 
@@ -47,7 +47,8 @@
         </Grid.RowDefinitions>
 
 		<StackPanel Orientation="Horizontal">
-			<Canvas Width="250" Height="Auto">
+			<Canvas Width="250" Height="Auto" x:Name="ChartCanvas">
+				<TextBox x:Name="OText" Width="30" Text="{Binding Path=Value, Mode=TwoWay}" />
 				<toolkit:Chart x:Name="chart1" Title="" Width="240" Height="220" Canvas.Left="0" Canvas.Top="0"
 							   FontSize="10">
 					<toolkit:Chart.Series>
@@ -88,21 +89,24 @@
 						</toolkit:ScatterSeries>
 					</toolkit:Chart.Series>
 				</toolkit:Chart>
-				<Slider x:Name="OrdinateSlider" Canvas.Left="0" Canvas.Top="10" Orientation="Vertical"  Height="200"></Slider>
-				<Slider x:Name="AbscissaSlider" Canvas.Left="20" Canvas.Top="210" Width="200" MouseLeftButtonUp="AbscissaSlider_MouseLeftButtonUp"></Slider>
+				<Slider x:Name="OrdinateSlider" Canvas.Left="0" Canvas.Top="10" Orientation="Vertical"  Height="200" MouseLeftButtonUp="OrdinateSlider_MouseLeftButtonUp"></Slider>
+				<Slider x:Name="AbscissaSlider" Canvas.Left="20" Canvas.Top="210" Width="200"></Slider>
 			</Canvas>
 
 
-			<StackPanel Orientation="Vertical">
-				<sdk:DataGrid x:Name="dataGrid" Margin="0,5,0,10" RowHeight="40" AutoGenerateColumns="False" >
-					<sdk:DataGrid.Columns>
-						<sdk:DataGridTextColumn Header="Abscissa" Width="40" Binding="{Binding abscissa}" />
-						<sdk:DataGridTextColumn Header="Positive Cases" Width="40"  Binding="{Binding positive}" />
-						<sdk:DataGridTextColumn Header="Negative Cases" Width="40" Binding="{Binding negative}" />
-					</sdk:DataGrid.Columns>
-				</sdk:DataGrid>
-				<Button x:Name="AddConditionButton" Content="Add Condition" Click="AddConditionButton_Click" HorizontalAlignment="Right" FontSize="10" Margin="0,12,0,0" Grid.Row="1" />
-			</StackPanel>
+			<ScrollViewer>
+				<StackPanel Orientation="Vertical">
+					<sdk:DataGrid x:Name="dataGrid" Margin="0,5,0,10" RowHeight="40" AutoGenerateColumns="False" >
+						<sdk:DataGrid.Columns>
+							<sdk:DataGridTextColumn Header="Abscissa" Width="40" Binding="{Binding abscissa}" />
+							<sdk:DataGridTextColumn Header="Positive Cases" Width="40"  Binding="{Binding positive}" />
+							<sdk:DataGridTextColumn Header="Negative Cases" Width="40" Binding="{Binding negative}" />
+						</sdk:DataGrid.Columns>
+					</sdk:DataGrid>
+					<Button x:Name="AddConditionButton" Content="Add Condition" Click="AddConditionButton_Click" Width="100" HorizontalAlignment="Right" FontSize="10" Margin="0,12,0,0" />
+					<Button x:Name="RemoveConditionButton" Content="Remove Condition" Click="RemoveConditionButton_Click" Width="100" HorizontalAlignment="Right" FontSize="10" Margin="0,0,0,0" />
+				</StackPanel>
+			</ScrollViewer>
 		</StackPanel>
 
 		<TextBlock Text="Mean" x:Name="Parameter0Name" Width="40" Height="23" HorizontalAlignment="Left" Margin="0,12,0,0" Grid.Row="1" />
diff --git a/dev4/Pages/BinomialSolver.xaml.cs b/dev4/Pages/BinomialSolver.xaml.cs
index 84c26e8..1e1eb82 100644
--- a/dev4/Pages/BinomialSolver.xaml.cs
+++ b/dev4/Pages/BinomialSolver.xaml.cs
@@ -15,6 +15,7 @@ namespace PsychlopsSilverlight4.Pages
 {
 	public partial class BinomialSolver : ChildWindow
 	{
+		System.Windows.Shapes.Line line;
 		int func_selected;
 		Psychlops.Solver.Constants.Func1 func1;
 		Psychlops.Solver.Constants.Func2 func2;
@@ -56,6 +57,13 @@ namespace PsychlopsSilverlight4.Pages
 
 			chart1.DataContext = data;
 			solver = new Psychlops.Solver.BinomialLikelihood();
+			line = new Line();
+			line.X1 = 0;
+			line.Y1 = 0;
+			line.X2 = ChartCanvas.ActualWidth;
+			line.Y2 = 0;
+			ChartCanvas.Children.Add(line);
+			OText.DataContext = OrdinateSlider;
 		}
 		public class Data
 		{
@@ -204,10 +212,55 @@ namespace PsychlopsSilverlight4.Pages
 			this.UpdateLayout();
 		}
 
-		private void AbscissaSlider_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+		private void RemoveConditionButton_Click(object sender, RoutedEventArgs e)
 		{
-			solver.champ[0] = AbscissaSlider.Value;
-			reFunc();
+			data.RemoveAt(data.Count-1);
+			this.UpdateLayout();
+		}
+
+		private void OrdinateSlider_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+		{
+			if (solver.champ[0] == 0.0) return;
+			int dir = 1, pdir, dirr=0, ii = 0;
+			double d = (maximum - minimum) * 0.25;
+			double refval = OrdinateSlider.Value;
+			double x1 = solver.champ[0], x2= x1 + d, v1, v2, tmp;
+			switch (func_selected)
+			{
+				case 1:
+					break;
+				case 2:
+					while (dirr < 32)
+					{
+						pdir = dir;
+						v1 = Math.Abs(refval - func2(x1, solver.champ[0], solver.champ[1]));
+						v2 = Math.Abs(refval - func2(x2, solver.champ[0], solver.champ[1]));
+						if (v1 > v2)
+						{
+							tmp = x2;
+							x1 = x2;
+							x2 = tmp + d;
+							dir = 1;
+						}
+						else
+						{
+							tmp = x1;
+							x2 = x1;
+							x1 = tmp - d;
+							dir = -1;
+						}
+						if (ii>32 || dir != pdir) { d /= 2; dirr++; ii = 0; }
+						ii++;
+					}
+					break;
+				case 3:
+					break;
+			}
+
+			AbscissaSlider.Value = (x1+x2)/2.0;
+			Parameter0.Text = AbscissaSlider.Value.ToString();
+			line.Y1 = refval * 200;
+			line.Y2 = refval * 200;
 		}
 
 	}
diff --git a/dev4/psychlops/core/graphic/shape.cs b/dev4/psychlops/core/graphic/shape.cs
index 23cbeca..b007b7f 100644
--- a/dev4/psychlops/core/graphic/shape.cs
+++ b/dev4/psychlops/core/graphic/shape.cs
@@ -70,6 +70,26 @@ namespace Psychlops{
 			set { begin = value; }
 		}
 
+		//public static Line[] this[int x] { get { return Array(x); } }
+		//public static Line[,] this[int x, int y] { get { return Array(x, y); } }
+		public static Line[] Array(int ind)
+		{
+			Line[] l = new Line[ind];
+			for(int i=0; i<ind; i++) { l[i] = new Line(); }
+			return l;
+		}
+		public static Line[,] Array(int indx, int indy)
+		{
+			Line[,] l = new Line[indx, indy];
+			for (int i = 0; i < indx; i++) { for (int j = 0; j < indy; j++) { l[i, j] = new Line(); } }
+			return l;
+		}
+
+
+		public Line()
+		{
+			set(0,0,0,0);
+		}
 		public Line(double x1, double y1, double x2, double y2)
 		{
 			set(x1, y1, x2, y2);
@@ -134,6 +154,22 @@ namespace Psychlops{
 	{
 		public Point v1, v2;
 
+		//public static Rectangle[] this[int x] { get { return Array(x); } }
+		//public static Rectangle[,] this[int x, int y] { get { return Array(x, y); } }
+		public static Rectangle[] Array(int ind)
+		{
+			Rectangle[] l = new Rectangle[ind];
+			for (int i = 0; i < ind; i++) { l[i] = new Rectangle(); }
+			return l;
+		}
+		public static Rectangle[,] Array(int indx, int indy)
+		{
+			Rectangle[,] l = new Rectangle[indx, indy];
+			for (int i = 0; i < indx; i++) { for (int j = 0; j < indy; j++) { l[i, j] = new Rectangle(); } }
+			return l;
+		}
+
+
 		public Rectangle()
 		{
 			set(0,0);
@@ -295,6 +331,21 @@ namespace Psychlops{
 		public Point datum { get; set; }
 		public double xdiameter, ydiameter;
 
+		//public static Ellipse[] this[int x] { get { return Array(x); } }
+		//public static Ellipse[,] this[int x, int y] { get { return Array(x, y); } }
+		public static Ellipse[] Array(int ind)
+		{
+			Ellipse[] l = new Ellipse[ind];
+			for (int i = 0; i < ind; i++) { l[i] = new Ellipse(); }
+			return l;
+		}
+		public static Ellipse[,] Array(int indx, int indy)
+		{
+			Ellipse[,] l = new Ellipse[indx, indy];
+			for (int i = 0; i < indx; i++) { for (int j = 0; j < indy; j++) { l[i, j] = new Ellipse(); } }
+			return l;
+		}
+
 		public Ellipse()
 		{
 			set(0,0);
diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index f5df20f..8b16867 100644
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -1,42 +1,121 @@
-
+///+ Prefix linkto BasicCode1
+//// Lines for set up Psychlops environment
 using Psychlops;
 
 namespace PsychlopsSilverlight4test
 {
 
 	public class PsychlopsMain
-	{
+	{///- Prefix linkto BasicCode1
+
+
+		///+ Main Routine
+		//// Psychlops runs at the first line of this function psychlops_main().
+		public void psychlops_main() {
+    ///+ 0 linkto BasicCode3_1a
+    ////Prepare global parameters
+     const int maxrectnum = 200;
+     int rectnum = 100/*ID:rectnumber 25.0 200.0 25.0*/;
+     double rectsize = 5.0/*ID:dotsize 1.0 10.0 1.0*/;
+     Rectangle[] rect = Rectangle.Array(maxrectnum);
+     double[] rectcolorR = new double[maxrectnum];
+     double[] rectcolorG = new double[maxrectnum];
+     double[] rectcolorB = new double[maxrectnum];
+    ///- 0 linkto BasicCode3_1a
+
+	 Canvas window = new Canvas(Canvas.window);
+
+     ///+ 1 linkto BasicCode3_1a
+     ////Initialize
+     for(int i=0; i < rectnum; i++){
+         ///+ 1.1 set1
+         ////set positions and sizes
+         rect[i].set(rectsize, rectsize); //Set a size of rectangles.
+         rect[i].centering();
+         rect[i].shift((i - 0.5  *rectnum) * rectsize* 1.5/*ID:RectHGap 1.0 3.0 0.5*/,
+                                        (i-0.5*rectnum) * rectsize * 1.5/*ID:RectVGap 1.0 3.0 0.5*/); //Move Rectangles to initial positions
+         ///- 1.1 set1
+         ///+ 1.2 set2
+         ////set colors
+		 rectcolorR[i] = Math.random(1.0) * 0.5/*ID:RGain 0.0 1.0 0.5*/; //Set R values. Note that "i" is converted to double-type.
+		 rectcolorG[i] = Math.random(1.0) * 0.5/*ID:GGain 0.0 1.0 0.5*/; //Set G values. Note that "i" is converted to double-type.
+		 rectcolorB[i] = Math.random(1.0) * 0.5/*ID:BGain 0.0 1.0 0.5*/; //Set B values. Note that "i" is converted to double-type.
+         ///- 1.2 set2
+         }
+    ///- 1 linkto BasicCode3_1a
+
+    ///+ 2 drawing
+    ////drawing objects
+    ///+ 2.1 linkto BasicCode3_2a
+    ////Prepare variables for movie control;
+    int frame=0;
+    int motion_dir=1;
+    double Horizontal_shift, Vertical_shift;
+    ///- 2.1 linkto BasicCode3_2a
+
+    while(!Keyboard.esc.pushed()){
+        window.clear(Color.black);
+        for(int i=0; i < rectnum; i++){
+         ///+ 2.2 loopset1
+         ////set positions and sizes
+
+         Horizontal_shift=Math.sin(2 * Math.PI * ((double)frame / 30.0/*ID:Period_HPosition 30 240 30*/))*motion_dir * 100.0/*ID:HSpeed 0.0 100.0 10.0*/; //Calculate horizontal displacement from the center.
+         Vertical_shift=Math.sin(2 * Math.PI * ((double)frame / 30.0/*ID:Period_HPosition 30 240 30*/))*motion_dir * 0.0/*ID:VSpeed 0.0 100.0 10.0*/;//Calculate vertical displacement from the center.
+         rect[i].resize(rectsize, rectsize); //Resize rectangles.
+         rect[i].centering(); //Rectangles are moved to the center...
+         rect[i].shift(Horizontal_shift + (i-0.5*rectnum) * rectsize * 1.5/*ID:RectHGap 1.0 3.0 0.5*/,
+                       Vertical_shift + (i-0.5*rectnum)  *rectsize * 1.5/*ID:RectVGap 1.0 3.0 0.5*/); //and then move to designated positions
+         ///- 2.2 loopset1
+
+         ///+ 2.3 linkto BasicCode3_2a
+         ////set colors 
+		 rectcolorR[i] = Math.random(1.0) * 0.5/*ID:RGain 0.0 1.0 0.5*/; //Set R values. Note that "i" is converted to double-type.
+		 rectcolorG[i] = Math.random(1.0) * 0.5/*ID:GGain 0.0 1.0 0.5*/; //Set G values. Note that "i" is converted to double-type.
+		 rectcolorB[i] = Math.random(1.0) * 0.5/*ID:BGain 0.0 1.0 0.5*/; //Set B values. Note that "i" is converted to double-type.
+         ///- 2.3 linkto BasicCode3_2a
+
+         }
+		///+ 2.4 linkto BasicCode3_1a
+        for(int i=0; i < rectnum; i++){
+            rect[i].draw(new Color(rectcolorR[i], rectcolorG[i], rectcolorB[i])); //draw objects by designated colors.
+        }
+        window.flip();
+       	///- 2.4 linkto BasicCode3_1a
+        frame++;
+    }
+    ///- 2 drawing
+
+}
+		///- Main Routine
+
+
+
+	}
+
+}
 
-		Psychlops.Widgets.Slider rect_size;
-		Psychlops.Widgets.Slider rect_lum;
-		Psychlops.Widgets.Slider bg_lum;
 
 
+/*
+using Psychlops;
+
+namespace PsychlopsSilverlight4test
+{
+
+	public class PsychlopsMain
+	{
 		void RectLuminance()
 		{
 			Canvas display = new Canvas(Canvas.window);
-			Interval rng = new Interval();
-			rect_size = new Psychlops.Widgets.Slider("Rect Size", 1 < rng < 500, 10.0);
-			rect_lum = new Psychlops.Widgets.Slider("Rect Luminance", 0.0 <= rng <= 1.0, 0.1);
-			bg_lum = new Psychlops.Widgets.Slider("BG Luminance", 0.0 <= rng <= 1.0, 0.1);
-			Ellipse drawee = new Ellipse(100, 100);
-			display.showFPS();
-			display.watchFPS();
-
-			Rectangle rect = new Rectangle(rect_size, rect_size);
-			rect.centering();
-
+			Psychlops.Solver.BinomialLikelihood.showWindow(Math.cumulativeNormalDistibution);
+			Letters le = new Letters("Reload to restart");
+			le.fill = Color.black;
+			le.align = Letters.HorizontalAlign.center;
 
-			Clock before = new Clock(), after = new Clock();
 			while (!Keyboard.esc.pushed())
 			{
-				Display.clear(bg_lum);
-				rect.resize(rect_size, rect_size).draw(rect_lum);
-				after.update();
-				display.var((after - before).at_msec(), 100, 100, Color.green);
-				display.var((after - before).at_msec(), 100, 200, Color.green);
-				drawee.centering().shift(Math.random(100), 0);
-				drawee.draw(Color.black);
+				Display.clear(Color.white);
+				le.centering().shift(-200,-10).draw();
 				Display.flip();
 			}
 
@@ -53,7 +132,7 @@ namespace PsychlopsSilverlight4test
 
 }
 
-
+*/