summaryrefslogtreecommitdiff
path: root/unit2.pas
diff options
context:
space:
mode:
Diffstat (limited to 'unit2.pas')
-rw-r--r--unit2.pas12
1 files changed, 6 insertions, 6 deletions
diff --git a/unit2.pas b/unit2.pas
index 984a849..e75d847 100644
--- a/unit2.pas
+++ b/unit2.pas
@@ -84,7 +84,7 @@ type
procedure initFilter(tps,hps,thps: tMyExtendedArray);
function ordnung: longint;
function ordnungsSchritt: boolean;
- function auswahlSchritt(minNutzen: extended; callback: tNotifyEvent): boolean;
+ function auswahlSchritt(minNutzen: extended; callBack: tNotifyEvent): boolean;
procedure anzeigen(sl: tStrings);
function dump: string;
function dumpWeite: string;
@@ -107,7 +107,7 @@ procedure liesExtendedArray(sl: tStrings; suf: string; var arr: tMyExtendedArray
function dumpArray(arr: tLongintArray): string; overload;
function dumpArray(arr: tLongintArray; werte: tMyExtendedArray): string; overload;
function dumpArray(arr: tExtendedLongintArray; werte: tMyExtendedArray): string; overload;
-function bruteForcen(tps,hps,thps,rs,cs: tMyExtendedArray; cutoff: longint; callback: tNotifyEvent): tLoesungArray;
+function bruteForcen(tps,hps,thps,rs,cs: tMyExtendedArray; cutoff: longint; iterationsCallBack,loesungsCallBack: tNotifyEvent): tLoesungArray;
implementation
@@ -866,7 +866,7 @@ begin
delete(result,1,2);
end;
-function bruteForcen(tps,hps,thps,rs,cs: tMyExtendedArray; cutoff: longint; callback: tNotifyEvent): tLoesungArray;
+function bruteForcen(tps,hps,thps,rs,cs: tMyExtendedArray; cutoff: longint; iterationsCallBack,loesungsCallBack: tNotifyEvent): tLoesungArray;
var
cLsg: tLoesung;
cLsgn: tLoesungArray;
@@ -889,12 +889,12 @@ begin
repeat
cLsgn:=tLoesungArray.create;
- while cLsg.auswahlSchritt(cLsgn.minNutzen(cutoff),callBack) do begin
+ while cLsg.auswahlSchritt(cLsgn.minNutzen(cutoff),iterationsCallBack) do begin
cLsgn.add(cLsg);
cLsg:=tLoesung.create(cLsg);
cLsgn.cutItOff(cutoff);
- if assigned(callBack) then
- callBack(nil);
+ if assigned(loesungsCallBack) then
+ loesungsCallBack(nil);
end;
result.einfuegen(cLsgn);
cLsgn.free;