Changeset 32 for trunk/Forms

Timestamp:

Oct 12, 2019, 11:01:10 PM (5 years ago)

Author:

chronos

Message:

• Modified: In computer form allow to stop AI play.
• Modified: Optimized moves history computation using MoveAll without animation.

Location:

trunk/Forms

Files:

• UFormComputer.lfm (modified) (1 diff)
• UFormComputer.lrj (modified) (1 diff)
• UFormComputer.pas (modified) (8 diffs)

trunk/Forms/UFormComputer.lfm

@@ -13 +13 @@
   OnShow = FormShow
   LCLVersion = '2.0.2.0'
-  object ButtonSolve: TButton
-    Left = 159
+  object ButtonStart: TButton
+    Left = 40
     Height = 38
-    Top = 281
+    Top = 24
     Width = 113
-    Caption = 'Solve'
-    OnClick = ButtonSolveClick
+    Caption = 'Start'
+    OnClick = ButtonStartClick
     TabOrder = 0
   end
+  object ButtonStop: TButton
+    Left = 208
+    Height = 38
+    Top = 24
+    Width = 113
+    Caption = 'Stop'
+    Enabled = False
+    OnClick = ButtonStopClick
+    TabOrder = 1
+  end
 end

trunk/Forms/UFormComputer.lrj

@@ -1 +1 @@
 {"version":1,"strings":[
 {"hash":1113,"name":"tformcomputer.caption","sourcebytes":[65,73],"value":"AI"},
-{"hash":5923781,"name":"tformcomputer.buttonsolve.caption","sourcebytes":[83,111,108,118,101],"value":"Solve"}
+{"hash":5941396,"name":"tformcomputer.buttonstart.caption","sourcebytes":[83,116,97,114,116],"value":"Start"},
+{"hash":371552,"name":"tformcomputer.buttonstop.caption","sourcebytes":[83,116,111,112],"value":"Stop"}
 ]}

trunk/Forms/UFormComputer.pas

@@ -28 +28 @@
 
   TFormComputer = class(TForm)
-    ButtonSolve: TButton;
-    procedure ButtonSolveClick(Sender: TObject);
+    ButtonStart: TButton;
+    ButtonStop: TButton;
+    procedure ButtonStartClick(Sender: TObject);
+    procedure ButtonStopClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -35 +37 @@
     procedure FormShow(Sender: TObject);
   private
+    Stop: Boolean;
     GameTries1: TGameTries;
     GameTries2: TGameTries;
@@ -147 +150 @@
 end;
 
-procedure TFormComputer.ButtonSolveClick(Sender: TObject);
+procedure TFormComputer.ButtonStartClick(Sender: TObject);
 var
   NewTry: TGameTry;
@@ -155 +158 @@
   GameTries: TGameTries;
 begin
+  ButtonStart.Enabled := False;
+  ButtonStop.Enabled := True;
+  Stop := False;
   with Core.Game do begin
-    while CanMove do begin
+    while CanMove and not Stop do begin
       NewTry := TGameTry.Create;
       NewTry.Game.Assign(Core.Game);
@@ -182 +188 @@
       end;
       MoveAllAndUpdate(GameTries[0].Moves[0]);
-{      if CanMergeDirection(drDown) then MoveAll(drDown)
-      else if CanMergeDirection(drRight) then MoveAll(drRight)
-      else if CanMergeDirection(drLeft) then MoveAll(drLeft)
-      else if CanMoveDirection(drDown) then MoveAll(drDown)
-      else if CanMoveDirection(drRight) then MoveAll(drRight)
-      else if CanMoveDirection(drLeft) then MoveAll(drLeft)
-      else if CanMoveDirection(drUp) then MoveAll(drUp)
+{      if CanMergeDirection(drDown) then MoveAllAnimate(drDown)
+      else if CanMergeDirection(drRight) then MoveAllAnimate(drRight)
+      else if CanMergeDirection(drLeft) then MoveAllAnimate(drLeft)
+      else if CanMoveDirection(drDown) then MoveAllAnimate(drDown)
+      else if CanMoveDirection(drRight) then MoveAllAnimate(drRight)
+      else if CanMoveDirection(drLeft) then MoveAllAnimate(drLeft)
+      else if CanMoveDirection(drUp) then MoveAllAnimate(drUp)
       else Break;
       }
@@ -195 +201 @@
     end;
   end;
+  ButtonStart.Enabled := True;
+  ButtonStop.Enabled := False;
+end;
+
+procedure TFormComputer.ButtonStopClick(Sender: TObject);
+begin
+  Stop := True;
 end;
 
@@ -224 +237 @@
   NewTry: TGameTry;
 begin
-  for Direction := Low(TMoveDirection) to High(TMoveDirection) do begin
+  for Direction := drLeft to drDown do begin
     if GameTry.Game.CanMoveDirection(Direction) then begin
       NewTry := TGameTry.Create;
@@ -230 +243 @@
       NewTry.Game.UndoEnabled := False;
       NewTry.Game.AnimationDuration := 0;
-      NewTry.Game.MoveAll(Direction);
+      NewTry.Game.MoveAllAnimate(Direction);
       SetLength(NewTry.Moves, Length(NewTry.Moves) + 1);
       NewTry.Moves[Length(NewTry.Moves) - 1] := Direction;