Changeset 86 for trunk/Forms/FormComputer.pas

Timestamp:

Jun 7, 2024, 12:47:11 PM (3 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Used TFormEx for all forms for code simplification.
• Fixed: Fullscreen mode switching error.

File:

• trunk/Forms/FormComputer.pas (moved) (moved from trunk/Forms/UFormComputer.pas ) (13 diffs)

trunk/Forms/FormComputer.pas

@@ -1 @@
-unit UFormComputer;
-
-{$mode delphi}
+unit FormComputer;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
-  UGame, fgl;
+  Game, Generics.Collections, Generics.Defaults, FormEx;
 
 type
@@ -23 +21 @@
   end;
 
-  TGameTries = class(TFPGObjectList<TGameTry>)
+  TGameTries = class(TObjectList<TGameTry>)
+  end;
+
+  { TGameTryComparer }
+
+  TGameTryComparer = class(TInterfacedObject, IComparer<TGameTry>)
+    function Compare(constref Left, Right: TGameTry): Integer; overload;
   end;
 
   { TFormComputer }
 
-  TFormComputer = class(TForm)
+  TFormComputer = class(TFormEx)
     ButtonStart: TButton;
     ButtonStop: TButton;
@@ -38 +42 @@
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
-    procedure FormShow(Sender: TObject);
   private
     Stop: Boolean;
@@ -46 +49 @@
     GameTries4: TGameTries;
     procedure TryAllDirections(GameTries: TGameTries; GameTry: TGameTry);
-  public
-
-  end;
-
-var
-  FormComputer: TFormComputer;
+  end;
+
 
 implementation
@@ -58 +57 @@
 
 uses
-  UCore;
+  Core;
 
 { TGameTry }
@@ -133 +132 @@
 end;
 
+{ TGameTryComparer }
+
+function TGameTryComparer.Compare(constref Left, Right: TGameTry): Integer;
+var
+  ScoreLeft: Double;
+  ScoreRight: Double;
+begin
+  ScoreLeft := Left.GetFitness;
+  ScoreRight := Right.GetFitness;
+  if ScoreLeft > ScoreRight then Result := -1
+  else if ScoreLeft < ScoreRight then Result := 1
+  else Result := 0;
+end;
+
 { TFormComputer }
 
@@ -139 +152 @@
 begin
   ButtonStopClick(Self);
-  Core.PersistentForm1.Save(Self);
 end;
 
@@ -161 +173 @@
   J: Integer;
   GameTries: TGameTries;
+  GameTryComparer: TGameTryComparer;
   Delay: Integer;
 begin
@@ -166 +179 @@
   ButtonStop.Enabled := True;
   Stop := False;
-  with Core.Game do begin
+  with Core.Core.Game do begin
     while CanMove and not Stop do begin
       NewTry := TGameTry.Create;
-      NewTry.Game.Assign(Core.Game);
+      NewTry.Game.Assign(Core.Core.Game);
       GameTries1.Clear;
       TryAllDirections(GameTries1, NewTry);
@@ -184 +197 @@
 
       GameTries := GameTries4;
-      GameTries.Sort(GameCompareScore);
+      GameTryComparer := TGameTryComparer.Create;
+      GameTries.Sort(GameTryComparer);
       S := '';
       for I := 0 to GameTries.Count - 1 do begin
@@ -221 +235 @@
 procedure TFormComputer.FormCreate(Sender: TObject);
 begin
-  Core.Translator1.TranslateComponentRecursive(Self);
-  Core.ThemeManager1.UseTheme(Self);
   GameTries1 := TGameTries.Create;
   GameTries2 := TGameTries.Create;
@@ -235 +247 @@
   FreeAndNil(GameTries3);
   FreeAndNil(GameTries4);
-end;
-
-procedure TFormComputer.FormShow(Sender: TObject);
-begin
-  Core.PersistentForm1.Load(Self);
 end;