From 4666d9f58ab930158c9e6fdd0262e38ce9f88129 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Tue, 20 Oct 2020 21:47:11 +0000 Subject: [PATCH] LazStats: Rename some forms from "*Frm" to "*Form" git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7789 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- applications/lazstats/source/LazStats.lpi | 6 +- .../multiple_regression/backregunit.lfm | 2 +- .../multiple_regression/backregunit.pas | 32 ++++----- .../multiple_regression/stepfwdmrunit.lfm | 2 +- .../multiple_regression/stepfwdmrunit.pas | 32 ++++----- .../analysis/multiple_regression/wlsunit.lfm | 2 +- .../analysis/multiple_regression/wlsunit.pas | 68 +++++++++---------- .../lazstats/source/forms/mainunit.pas | 18 ++--- 8 files changed, 81 insertions(+), 81 deletions(-) diff --git a/applications/lazstats/source/LazStats.lpi b/applications/lazstats/source/LazStats.lpi index 35f8652dc..941f47cb5 100644 --- a/applications/lazstats/source/LazStats.lpi +++ b/applications/lazstats/source/LazStats.lpi @@ -489,7 +489,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -913,7 +913,7 @@ - + diff --git a/applications/lazstats/source/forms/analysis/multiple_regression/backregunit.lfm b/applications/lazstats/source/forms/analysis/multiple_regression/backregunit.lfm index 7cd567a70..b999abbc6 100644 --- a/applications/lazstats/source/forms/analysis/multiple_regression/backregunit.lfm +++ b/applications/lazstats/source/forms/analysis/multiple_regression/backregunit.lfm @@ -1,4 +1,4 @@ -inherited BackRegFrm: TBackRegFrm +inherited BackRegForm: TBackRegForm Left = 622 Height = 398 Top = 187 diff --git a/applications/lazstats/source/forms/analysis/multiple_regression/backregunit.pas b/applications/lazstats/source/forms/analysis/multiple_regression/backregunit.pas index 0192ac134..770e4a5f4 100644 --- a/applications/lazstats/source/forms/analysis/multiple_regression/backregunit.pas +++ b/applications/lazstats/source/forms/analysis/multiple_regression/backregunit.pas @@ -12,9 +12,9 @@ uses type - { TBackRegFrm } + { TBackRegForm } - TBackRegFrm = class(TBasicStatsReportForm) + TBackRegForm = class(TBasicStatsReportForm) OpenDialog1: TOpenDialog; InBtn: TBitBtn; OutBtn: TBitBtn; @@ -60,7 +60,7 @@ type end; var - BackRegFrm: TBackRegFrm; + BackRegForm: TBackRegForm; implementation @@ -72,9 +72,9 @@ uses Utils; -{ TBackRegFrm } +{ TBackRegForm } -procedure TBackRegFrm.AdjustConstraints; +procedure TBackRegForm.AdjustConstraints; begin inherited; @@ -89,7 +89,7 @@ begin end; -procedure TBackRegFrm.AllBtnClick(Sender: TObject); +procedure TBackRegForm.AllBtnClick(Sender: TObject); var index: integer; begin @@ -100,7 +100,7 @@ begin end; -procedure TBackRegFrm.Compute; +procedure TBackRegForm.Compute; var NoVars, NoIndepVars, i, j, NCases, StepNo : integer; Index: integer; @@ -341,7 +341,7 @@ begin end; -procedure TBackRegFrm.DepInBtnClick(Sender: TObject); +procedure TBackRegForm.DepInBtnClick(Sender: TObject); var index: integer; begin @@ -355,7 +355,7 @@ begin end; -procedure TBackRegFrm.DepOutBtnClick(Sender: TObject); +procedure TBackRegForm.DepOutBtnClick(Sender: TObject); begin if DepVarEdit.Text <> '' then begin @@ -366,7 +366,7 @@ begin end; -procedure TBackRegFrm.InBtnClick(Sender: TObject); +procedure TBackRegForm.InBtnClick(Sender: TObject); var i: integer; begin @@ -386,7 +386,7 @@ begin end; -procedure TBackRegFrm.OutBtnClick(Sender: TObject); +procedure TBackRegForm.OutBtnClick(Sender: TObject); var i: Integer; begin @@ -405,7 +405,7 @@ begin UpdateBtnStates; end; -procedure TBackRegFrm.Reset; +procedure TBackRegForm.Reset; var i: integer; begin @@ -431,7 +431,7 @@ begin end; -procedure TBackRegFrm.SelListDblClick(Sender: TObject); +procedure TBackRegForm.SelListDblClick(Sender: TObject); var index: Integer; begin @@ -445,7 +445,7 @@ begin end; -procedure TBackRegFrm.UpdateBtnStates; +procedure TBackRegForm.UpdateBtnStates; var lSelected: Boolean; begin @@ -460,7 +460,7 @@ begin end; -procedure TBackRegFrm.VarListDblClick(Sender: TObject); +procedure TBackRegForm.VarListDblClick(Sender: TObject); var index: Integer; begin @@ -477,7 +477,7 @@ begin end; -procedure TBackRegFrm.VarListSelectionChange(Sender: TObject; User: boolean); +procedure TBackRegForm.VarListSelectionChange(Sender: TObject; User: boolean); begin UpdateBtnStates; end; diff --git a/applications/lazstats/source/forms/analysis/multiple_regression/stepfwdmrunit.lfm b/applications/lazstats/source/forms/analysis/multiple_regression/stepfwdmrunit.lfm index f6355b1a8..45c9823e9 100644 --- a/applications/lazstats/source/forms/analysis/multiple_regression/stepfwdmrunit.lfm +++ b/applications/lazstats/source/forms/analysis/multiple_regression/stepfwdmrunit.lfm @@ -1,4 +1,4 @@ -object StepFwdFrm: TStepFwdFrm +object StepFwdForm: TStepFwdForm Left = 989 Height = 470 Top = 243 diff --git a/applications/lazstats/source/forms/analysis/multiple_regression/stepfwdmrunit.pas b/applications/lazstats/source/forms/analysis/multiple_regression/stepfwdmrunit.pas index d9211f093..1ac377d41 100644 --- a/applications/lazstats/source/forms/analysis/multiple_regression/stepfwdmrunit.pas +++ b/applications/lazstats/source/forms/analysis/multiple_regression/stepfwdmrunit.pas @@ -11,9 +11,9 @@ uses type - { TStepFwdFrm } + { TStepFwdForm } - TStepFwdFrm = class(TForm) + TStepFwdForm = class(TForm) Bevel1: TBevel; Bevel2: TBevel; GroupBox2: TGroupBox; @@ -67,7 +67,7 @@ type end; var - StepFwdFrm: TStepFwdFrm; + StepFwdForm: TStepFwdForm; implementation @@ -75,9 +75,9 @@ uses Math, Utils, MathUnit; -{ TStepFwdFrm } +{ TStepFwdForm } -procedure TStepFwdFrm.ResetBtnClick(Sender: TObject); +procedure TStepFwdForm.ResetBtnClick(Sender: TObject); var i: integer; begin @@ -101,7 +101,7 @@ begin PredictChkBox.Checked := false; end; -procedure TStepFwdFrm.FormActivate(Sender: TObject); +procedure TStepFwdForm.FormActivate(Sender: TObject); var w: Integer; begin @@ -121,17 +121,17 @@ begin FAutoSized := true; end; -procedure TStepFwdFrm.FormCreate(Sender: TObject); +procedure TStepFwdForm.FormCreate(Sender: TObject); begin Assert(OS3MainFrm <> nil); end; -procedure TStepFwdFrm.FormShow(Sender: TObject); +procedure TStepFwdForm.FormShow(Sender: TObject); begin ResetBtnClick(Self); end; -procedure TStepFwdFrm.AllBtnClick(Sender: TObject); +procedure TStepFwdForm.AllBtnClick(Sender: TObject); var index: integer; begin @@ -141,7 +141,7 @@ begin UpdateBtnStates; end; -procedure TStepFwdFrm.ComputeBtnClick(Sender: TObject); +procedure TStepFwdForm.ComputeBtnClick(Sender: TObject); Label lastone; var @@ -512,7 +512,7 @@ lastone: end; end; -procedure TStepFwdFrm.DepInBtnClick(Sender: TObject); +procedure TStepFwdForm.DepInBtnClick(Sender: TObject); var index: integer; begin @@ -525,7 +525,7 @@ begin UpdateBtnStates; end; -procedure TStepFwdFrm.DepOutBtnClick(Sender: TObject); +procedure TStepFwdForm.DepOutBtnClick(Sender: TObject); begin if DepVar.Text <> '' then begin @@ -535,7 +535,7 @@ begin UpdateBtnStates; end; -procedure TStepFwdFrm.InBtnClick(Sender: TObject); +procedure TStepFwdForm.InBtnClick(Sender: TObject); var i: integer; begin @@ -554,12 +554,12 @@ begin UpdateBtnStates; end; -procedure TStepFwdFrm.SelListSelectionChange(Sender: TObject; User: boolean); +procedure TStepFwdForm.SelListSelectionChange(Sender: TObject; User: boolean); begin UpdateBtnStates; end; -procedure TStepFwdFrm.OutBtnClick(Sender: TObject); +procedure TStepFwdForm.OutBtnClick(Sender: TObject); var i: integer; begin @@ -578,7 +578,7 @@ begin UpdateBtnStates; end; -procedure TStepFwdFrm.UpdateBtnStates; +procedure TStepFwdForm.UpdateBtnStates; begin DepInBtn.Enabled := (VarList.ItemIndex > -1) and (DepVar.Text = ''); DepOutBtn.Enabled := (DepVar.Text <> ''); diff --git a/applications/lazstats/source/forms/analysis/multiple_regression/wlsunit.lfm b/applications/lazstats/source/forms/analysis/multiple_regression/wlsunit.lfm index 55585fa91..7c872f932 100644 --- a/applications/lazstats/source/forms/analysis/multiple_regression/wlsunit.lfm +++ b/applications/lazstats/source/forms/analysis/multiple_regression/wlsunit.lfm @@ -1,4 +1,4 @@ -inherited WLSFrm: TWLSFrm +inherited WLSForm: TWLSForm Left = 288 Height = 469 Top = 171 diff --git a/applications/lazstats/source/forms/analysis/multiple_regression/wlsunit.pas b/applications/lazstats/source/forms/analysis/multiple_regression/wlsunit.pas index 16b5f37d3..2b6c88112 100644 --- a/applications/lazstats/source/forms/analysis/multiple_regression/wlsunit.pas +++ b/applications/lazstats/source/forms/analysis/multiple_regression/wlsunit.pas @@ -12,9 +12,9 @@ uses type - { TWLSFrm } + { TWLSForm } - TWLSFrm = class(TBasicStatsParamsForm) + TWLSForm = class(TBasicStatsParamsForm) DepInBtn: TBitBtn; DepOutBtn: TBitBtn; IndInBtn: TBitBtn; @@ -119,7 +119,7 @@ type end; var - WLSFrm: TWLSFrm; + WLSForm: TWLSForm; implementation @@ -134,9 +134,9 @@ uses const CONF_LEVEL = DEFAULT_CONFIDENCE_LEVEL_PERCENT / 100.0; -{ TWLSFrm } +{ TWLSForm } -constructor TWLSFrm.Create(AOwner: TComponent); +constructor TWLSForm.Create(AOwner: TComponent); begin inherited; if DictionaryFrm = nil then Application.CreateForm(TDictionaryFrm, DictionaryFrm); @@ -179,7 +179,7 @@ end; and writes the specified data to the grid (in the specified number format). Rows mentioned in ABadRows must be omitted because they are not contained in AData. } -procedure TWLSFrm.AddVariable(AVarName: String; AData: DblDyneVec; +procedure TWLSForm.AddVariable(AVarName: String; AData: DblDyneVec; ANumFormat: String; const ABadRows: IntDyneVec); function IsBadRow(ARow: Integer): Boolean; @@ -221,7 +221,7 @@ end; { Calculate predicted squared residuals and save recipricols to grid as weights } -procedure TWLSFrm.AddWeightsToGrid(const ASqrPredictedResiduals, AWeights: DblDyneVec; +procedure TWLSForm.AddWeightsToGrid(const ASqrPredictedResiduals, AWeights: DblDyneVec; const ABadRows: IntDyneVec); begin // Create new variables and add to grid @@ -231,7 +231,7 @@ end; { Calculate predicted values of the squared residuals, as well as the weights } -procedure TWLSFrm.CalcWeights(xValues: DblDyneMat; ACoeffs: DblDyneVec; +procedure TWLSForm.CalcWeights(xValues: DblDyneMat; ACoeffs: DblDyneVec; out ASquaredPredictedResiduals: DblDyneVec; out AWeights: DblDyneVec); var i, j, n, m: Integer; @@ -259,7 +259,7 @@ begin end; -procedure TWLSFrm.AdjustConstraints; +procedure TWLSForm.AdjustConstraints; begin ParamsPanel.Constraints.MinHeight := DepInBtn.Top + (IndOutBtn.Top - DepInBtn.Top)*2 + DepInBtn.Top + OptionsGroup.Height + ButtonBevel.Height + CloseBtn.BorderSpacing.Top + CloseBtn.Height; @@ -271,7 +271,7 @@ begin end; -procedure TWLSFrm.Compute; +procedure TWLSForm.Compute; var indepCols: IntDyneVec = nil; rowLabels: StrDyneVec = nil; @@ -305,7 +305,7 @@ begin end; -procedure TWLSFrm.CreateOrGetChartFrame(AColIndex: Integer; AVarName: String; +procedure TWLSForm.CreateOrGetChartFrame(AColIndex: Integer; AVarName: String; out AMemo: TMemo; out AChartFrame: TChartFrame); var sheetTitle: String; @@ -374,7 +374,7 @@ begin end; -procedure TWLSFrm.DepInBtnClick(Sender: TObject); +procedure TWLSForm.DepInBtnClick(Sender: TObject); var index: integer; begin @@ -388,7 +388,7 @@ begin end; -procedure TWLSFrm.DepOutBtnClick(Sender: TObject); +procedure TWLSForm.DepOutBtnClick(Sender: TObject); begin if (DepVarEdit.Text <> '') then begin @@ -399,13 +399,13 @@ begin end; -function TWLSFrm.GetPageCaption(AVarName: String): String; +function TWLSForm.GetPageCaption(AVarName: String): String; begin Result := 'Plot of ' + AVarName; end; -procedure TWLSFrm.IndInBtnClick(Sender: TObject); +procedure TWLSForm.IndInBtnClick(Sender: TObject); var i: integer; begin @@ -423,7 +423,7 @@ begin UpdateBtnStates; end; -procedure TWLSFrm.IndOutBtnClick(Sender: TObject); +procedure TWLSForm.IndOutBtnClick(Sender: TObject); var i: integer; begin @@ -442,7 +442,7 @@ begin end; -procedure TWLSFrm.IndVarListDblClick(Sender: TObject); +procedure TWLSForm.IndVarListDblClick(Sender: TObject); var index: Integer; begin @@ -458,7 +458,7 @@ end; { We will plot the selected vector of the independent values vertically, and the dependent values horizontally. } -procedure TWLSFrm.PlotSquaredResiduals(AIndepCols: IntDyneVec; +procedure TWLSForm.PlotSquaredResiduals(AIndepCols: IntDyneVec; ADepCol: Integer; const AIndepValues: DblDyneMat; const ADepValues: DblDyneVec); var x, y: DblDyneVec; @@ -496,7 +496,7 @@ begin end; -procedure TWLSFrm.PlotXY(AChartFrame: TChartFrame; const XPoints, YPoints: DblDyneVec; +procedure TWLSForm.PlotXY(AChartFrame: TChartFrame; const XPoints, YPoints: DblDyneVec; const ARegressionResults: TBivariateRegressionResults; const XLabel, YLabel: String); var xpts: DblDyneVec = nil; @@ -566,7 +566,7 @@ end; residuals. It is assumed that the dependent variable is last in the list of variable column pointers stored in the ColNoSelected vector. Get the z predicted score and its residual } -procedure TWLSFrm.Predict(const xData: DblDyneMat; const yData: DblDyneVec; +procedure TWLSForm.Predict(const xData: DblDyneMat; const yData: DblDyneVec; const ABadRows: IntDyneVec; ARegressionResults: TMultipleRegressionResults); var means, stddevs, variances: DblDyneVec; @@ -638,7 +638,7 @@ end; in the colums specified by AIndepCols. A value is "invalid" when it is filtered, numeric but empty, or contains the missing value code. } -function TWLSFrm.PrepareData(out AIndepCols: IntDyneVec; out ADepCol: Integer; +function TWLSForm.PrepareData(out AIndepCols: IntDyneVec; out ADepCol: Integer; out AWeightCol: Integer; out ARowLabels: StrDyneVec; out xValues: DblDyneMat; out yValues: DblDyneVec; out AWeights: DblDyneVec; out ABadRows: IntDyneVec): Boolean; @@ -745,7 +745,7 @@ end; { Runs the ordinary least squares regression on the grid data } -function TWLSFrm.Process_OLSRegression(AIndepCols: IntDyneVec; +function TWLSForm.Process_OLSRegression(AIndepCols: IntDyneVec; ADepCol: Integer; const ARowLabels: StrDyneVec; const xValues: DblDyneMat; const yValues: DblDyneVec; const ABadRows: IntDyneVec): Boolean; @@ -783,7 +783,7 @@ begin end; -function TWLSFrm.Process_SquaredResidualsRegression(AIndepCols: IntDyneVec; +function TWLSForm.Process_SquaredResidualsRegression(AIndepCols: IntDyneVec; const ARowLabels: StrDyneVec; const xValues: DblDyneMat; out AWeights: DblDyneVec; const ABadRows: IntDyneVec): Boolean; var @@ -840,7 +840,7 @@ begin end; -function TWLSFrm.Process_WeightedRegression(AIndepCols: IntDyneVec; +function TWLSForm.Process_WeightedRegression(AIndepCols: IntDyneVec; const ARowLabels: StrDyneVec; const xValues: DblDyneMat; const yValues: DblDyneVec; const AWeights: DblDyneVec; SubtractMeans: Boolean): Boolean; var @@ -893,7 +893,7 @@ begin end; -function TWLSFrm.RegressionAndReport(const ARowLabels: StrDyneVec; +function TWLSForm.RegressionAndReport(const ARowLabels: StrDyneVec; const xValues: DblDyneMat; const yValues: DblDyneVec; out ARegressionResults: TMultipleRegressionResults; AReport: TStrings): Boolean; var @@ -922,7 +922,7 @@ begin end; -procedure TWLSFrm.Reset; +procedure TWLSForm.Reset; var i: integer; begin @@ -952,7 +952,7 @@ begin end; -procedure TWLSFrm.UpdateBtnStates; +procedure TWLSForm.UpdateBtnStates; var i: Integer; lSelected: Boolean; @@ -991,7 +991,7 @@ begin end; -procedure TWLSFrm.UserWeightsChkChange(Sender: TObject); +procedure TWLSForm.UserWeightsChkChange(Sender: TObject); begin WeightVarEdit.Enabled := UserWeightsChk.Checked; Label4.Enabled := WeightVarEdit.Enabled; @@ -1000,7 +1000,7 @@ begin end; -function TWLSFrm.Validate(out AMsg: String; out AControl: TWinControl): Boolean; +function TWLSForm.Validate(out AMsg: String; out AControl: TWinControl): Boolean; begin Result := false; @@ -1022,7 +1022,7 @@ begin end; -procedure TWLSFrm.VarListDblClick(Sender: TObject); +procedure TWLSForm.VarListDblClick(Sender: TObject); var index: Integer; begin @@ -1039,13 +1039,13 @@ begin end; -procedure TWLSFrm.VarListSelectionChange(Sender: TObject; User: boolean); +procedure TWLSForm.VarListSelectionChange(Sender: TObject; User: boolean); begin UpdateBtnStates; end; -procedure TWLSFrm.WeightInBtnClick(Sender: TObject); +procedure TWLSForm.WeightInBtnClick(Sender: TObject); var index: integer; begin @@ -1059,7 +1059,7 @@ begin end; -procedure TWLSFrm.WeightOutBtnClick(Sender: TObject); +procedure TWLSForm.WeightOutBtnClick(Sender: TObject); begin if (WeightVarEdit.Text <> '') then begin @@ -1070,7 +1070,7 @@ begin end; -procedure TWLSFrm.WriteDescriptiveReport(AMemo: TMemo; +procedure TWLSForm.WriteDescriptiveReport(AMemo: TMemo; const ARegressionResults: TBivariateRegressionResults; const XLabel, YLabel: String); var diff --git a/applications/lazstats/source/forms/mainunit.pas b/applications/lazstats/source/forms/mainunit.pas index 213096e04..1cb8fd968 100644 --- a/applications/lazstats/source/forms/mainunit.pas +++ b/applications/lazstats/source/forms/mainunit.pas @@ -2036,9 +2036,9 @@ end; // Menu "Analysis" > "Multiple Regression" > "Backward Stepwise" procedure TOS3MainFrm.mnuAnalysisMultReg_BackwardClick(Sender: TObject); begin - if BackRegFrm = nil then - Application.CreateForm(TBackRegFrm, BackRegFrm); - BackRegFrm.ShowModal; + if BackRegForm = nil then + Application.CreateForm(TBackRegForm, BackRegForm); + BackRegForm.Show; end; // Menu "Analysis" > "Multiple Regression" > "Best Combination" @@ -2075,9 +2075,9 @@ end; // Menu "Analysis" > "Multiple Regression" > "Forward Stepwise" procedure TOS3MainFrm.mnuAnalysisMultReg_ForwardClick(Sender: TObject); begin - if StepFwdFrm = nil then - Application.CreateForm(TStepFwdFrm, StepFwdFrm); - StepFwdFrm.ShowModal; + if StepFwdForm = nil then + Application.CreateForm(TStepFwdForm, StepFwdForm); + StepFwdForm.Show; end; // Menu "Analysis" > "Multiple Regression" > "Linear Programming" @@ -2115,9 +2115,9 @@ end; // Menu "Analysis" > "Multiple Regression" > "Weighted Least Squares Regression" procedure TOS3MainFrm.mnuAnalysisMultReg_WeightedClick(Sender: TObject); begin - if WLSFrm = nil then - Application.CreateForm(TWLSFrm, WLSFrm); - WLSFrm.Show; + if WLSForm = nil then + Application.CreateForm(TWLSForm, WLSForm); + WLSForm.Show; end;