Changeset 60 for trunk

Timestamp:

Sep 26, 2014, 12:27:50 AM (10 years ago)

Author:

chronos

Message:

• Fixed: Limited depth of win probability calculation.
• Fixed: Show probability using sum of all attacking units from multiple cells.

Location:

trunk

Files:

• Forms/UFormMove.pas (modified) (2 diffs)
• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (6 diffs)

trunk/Forms/UFormMove.pas

@@ -42 +42 @@
   public
     DefendCount: Integer;
+    AttackCount: Integer;
     procedure UpdateView;
   end;
@@ -72 +73 @@
 begin
   LabelWinProbability.Caption :=
-    IntToStr(Round(Core.Game.AttackProbability(SpinEditOnce.Value,
-    DefendCount) * 100)) + ' %';
+    IntToStr(Round(Core.Game.AttackProbability(AttackCount + SpinEditOnce.Value,
+    DefendCount, 1) * 100)) + ' %';
 end;
 

trunk/UCore.pas

@@ -89 +89 @@
   FormMove.TrackBarRepeat.Position := FormMove.SpinEditRepeat.Value;
   FormMove.DefendCount := CellTo.Power;
+  FormMove.AttackCount := CellTo.GetAttackPower;
   if FormMove.ShowModal = mrOk then begin
     CountOnce := FormMove.SpinEditOnce.Value;

trunk/UGame.pas

@@ -50 +50 @@
     function GetColor: TColor;
     function GetAvialPower: Integer;
+    function GetAttackPower: Integer;
     constructor Create;
     destructor Destroy; override;
@@ -252 +253 @@
     StayAliveForDefinedTurns: Integer;
     MaxNeutralUnits: Integer;
-    function AttackProbability(AttackCount, DefendCount: Integer): Double;
+    function AttackProbability(AttackCount, DefendCount, Depth: Integer): Double;
     procedure SaveConfig(Config: TXmlConfig; Path: string);
     procedure LoadConfig(Config: TXmlConfig; Path: string);
@@ -899 +900 @@
     Result := Result - TUnitMove(MovesFrom[I]).CountOnce;
   if Result < 0 then Result := 0;
+end;
+
+function TCell.GetAttackPower: Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := 0 to MovesTo.Count - 1 do
+    Result := Result + TUnitMove(MovesTo[I]).CountOnce;
 end;
 
@@ -1143 +1153 @@
 end;
 
-function TGame.AttackProbability(AttackCount, DefendCount: Integer): Double;
+function TGame.AttackProbability(AttackCount, DefendCount, Depth: Integer): Double;
 var
   OA, OD: Integer;
@@ -1152 +1162 @@
   end else Result := 1;
   if DefendCount = 0 then Exit;
+  if Depth > 5 then Exit;
 
   OA := Min(AttackCount, 3);
@@ -1157 +1168 @@
 
   if (OA = 1) and (OD = 1) then
-    Result := 0.4167 * AttackProbability(AttackCount, DefendCount - 1) +
-      0.5833 * AttackProbability(AttackCount - 1, DefendCount)
+    Result := 0.4167 * AttackProbability(AttackCount, DefendCount - 1, Depth + 1) +
+      0.5833 * AttackProbability(AttackCount - 1, DefendCount, Depth + 1)
   else if (OA = 2) and (OD = 1) then
-    Result := 0.5787 * AttackProbability(AttackCount, DefendCount - 1) +
-      0.4213 * AttackProbability(AttackCount - 1, DefendCount)
+    Result := 0.5787 * AttackProbability(AttackCount, DefendCount - 1, Depth + 1) +
+      0.4213 * AttackProbability(AttackCount - 1, DefendCount, Depth + 1)
   else if (OA = 3) and (OD = 1) then
-    Result := 0.6597 * AttackProbability(AttackCount, DefendCount - 1) +
-      0.3403 * AttackProbability(AttackCount - 1, DefendCount)
+    Result := 0.6597 * AttackProbability(AttackCount, DefendCount - 1, Depth + 1) +
+      0.3403 * AttackProbability(AttackCount - 1, DefendCount, Depth + 1)
   else if (OA = 1) and (OD = 2) then
-    Result := 0.2546 * AttackProbability(AttackCount, DefendCount - 1) +
-      0.7454 * AttackProbability(AttackCount - 1, DefendCount)
+    Result := 0.2546 * AttackProbability(AttackCount, DefendCount - 1, Depth + 1) +
+      0.7454 * AttackProbability(AttackCount - 1, DefendCount, Depth + 1)
   else if (OA = 2) and (OD = 2) then
-    Result := 0.2276 * AttackProbability(AttackCount, DefendCount - 2) +
-      0.4483 * AttackProbability(AttackCount - 2, DefendCount) +
-      0.3241 * AttackProbability(AttackCount - 1, DefendCount - 1)
+    Result := 0.2276 * AttackProbability(AttackCount, DefendCount - 2, Depth + 1) +
+      0.4483 * AttackProbability(AttackCount - 2, DefendCount, Depth + 1) +
+      0.3241 * AttackProbability(AttackCount - 1, DefendCount - 1, Depth + 1)
   else if (OA = 3) and (OD = 2) then
-    Result := 0.3717 * AttackProbability(AttackCount, DefendCount - 2) +
-      0.2926 * AttackProbability(AttackCount - 2, DefendCount) +
-      0.3358 * AttackProbability(AttackCount - 1, DefendCount - 1);
+    Result := 0.3717 * AttackProbability(AttackCount, DefendCount - 2, Depth + 1) +
+      0.2926 * AttackProbability(AttackCount - 2, DefendCount, Depth + 1) +
+      0.3358 * AttackProbability(AttackCount - 1, DefendCount - 1, Depth + 1);
 end;