Fix TCircle.RandomPoint + test

Villavu · Oct 29, 2024 · 152b215 · 152b215
1 parent 0a38464
commit 152b215
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/Source/simba.vartype_circle.pas b/Source/simba.vartype_circle.pas
@@ -152,26 +152,26 @@ function TCircleHelper.RandomPoint: TPoint;
 var
   R, Theta, SinValue, CosValue: Double;
 begin
-  R := Radius * Sqrt(Random());
+  R := Floor(Radius * Sqrt(Random()));
   Theta := Random() * 2 * PI;
 
   SinCos(Theta, SinValue, CosValue);
 
   Result.X := Center.X + Round(R * CosValue);
-  Result.Y := Center.X + Round(R * SinValue);
+  Result.Y := Center.Y + Round(R * SinValue);
 end;
 
 function TCircleHelper.RandomPointCenter: TPoint;
 var
   R, Theta, SinValue, CosValue: Double;
 begin
-  R := Radius * Sqrt(RandomLeft(0.0, 1.0));
+  R := Floor(Radius * Sqrt(RandomLeft(0.0, 1.0)));
   Theta := Random() * 2 * PI;
 
   SinCos(Theta, SinValue, CosValue);
 
   Result.X := Center.X + Round(R * CosValue);
-  Result.Y := Center.X + Round(R * SinValue);
+  Result.Y := Center.Y + Round(R * SinValue);
 end;
 
 function TCircleHelper.Circularity(TPA: TPointArray): Double;

diff --git a/Tests/circle.simba b/Tests/circle.simba
@@ -0,0 +1,19 @@
+{$assertions on}
+
+var
+  c: TCircle;
+begin
+  c := TCircle.Create(100, 100, 25);
+
+  Assert(c.Contains([100, 125]));
+  Assert(not c.Contains([100, 126]));
+  Assert(c.Contains([117, 117]));
+  Assert(not c.Contains([118, 118]));
+
+  RandSeed := 123;
+
+  for 1 to 1000 do
+    Assert(c.Contains(c.RandomPoint));
+  for 1 to 1000 do
+    Assert(c.Contains(c.RandomPointCenter));
+end.