Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving instat code from R-Instat into separate R packages #9362

Merged
merged 18 commits into from
Feb 27, 2025
Merged

Moving instat code from R-Instat into separate R packages #9362

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
abc9056
Update to using instatCalculation R file
lilyclements Jan 15, 2025
1f8a930
adding instatCalculations to calculation$new
lilyclements Jan 17, 2025
1a0dd58
Merge branch 'master' into moving_to_instatCalculation
lilyclements Jan 29, 2025
5ab0f23
Merge branch 'master' into moving_to_instatCalculation
lilyclements Feb 16, 2025
c5987dd
adding databook to library, and adding to functions
lilyclements Feb 16, 2025
d1f7905
add databook to find_df_from_calc_from
lilyclements Feb 16, 2025
e9aeee2
Removing code for testing
lilyclements Feb 16, 2025
be64547
removed o_by_c file
lilyclements Feb 16, 2025
bd4a79f
removing some functionns from summary_functions.R
lilyclements Feb 16, 2025
68aad07
removing code in summary_functions.R files
lilyclements Feb 17, 2025
2f5e603
updating to include instatExtras
lilyclements Feb 17, 2025
c549994
Update stand_alone_functions.R
lilyclements Feb 17, 2025
e0fc3db
adding pkg names to dlgs
lilyclements Feb 20, 2025
fb9889b
removing repeated code
lilyclements Feb 20, 2025
7002232
Adding in instatCalculations:: for changes made since last addition
lilyclements Feb 20, 2025
38aefd8
Adding pkg names
lilyclements Feb 20, 2025
ce7d957
convert_to_character_matrix pkg call update
lilyclements Feb 20, 2025
bff1c0a
adding certain functions to the environment for old RDS files
lilyclements Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions instat/clsQualityControl.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Public Class clsQCJumpRCode
clsPmaxFunction.bToScriptAsRString = True

strCalcName = strlargestJump
clsJumpCalcFunction.SetRCommand("instat_calculation$new")
clsJumpCalcFunction.SetRCommand("instatCalculations::instat_calculation$new")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E.g., here we want to separate into

clsJumpCalcFunction.SetPackageName("instatCalculations")
clsJumpCalcFunction.SetRCommand("instat_calculation$new")

I just did it this way as a quick check to see if it would actually work. I'm very surprised it worked for the testing I did.

clsJumpCalcFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsJumpCalcFunction.AddParameter("function_exp", clsRFunctionParameter:=clsPmaxFunction, iPosition:=1)
clsJumpCalcFunction.AddParameter("result_name", Chr(34) & strCalcName & Chr(34), iPosition:=4)
Expand All @@ -75,7 +75,7 @@ Public Class clsQCJumpRCode
strTestName = strJumpTest
clsJumpListFunc.SetRCommand("list")
clsJumpListFunc.AddParameter("sub1", clsRFunctionParameter:=clsJumpCalcFunction, bIncludeArgumentName:=False)
clsJumpTestFunction.SetRCommand("instat_calculation$new")
clsJumpTestFunction.SetRCommand("instatCalculations::instat_calculation$new")
clsJumpTestFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsJumpTestFunction.AddParameter("function_exp", clsROperatorParameter:=clsGreaterJumpOperator, iPosition:=1)
clsJumpTestFunction.AddParameter("result_name", Chr(34) & strTestName & Chr(34), iPosition:=4)
Expand Down Expand Up @@ -131,7 +131,7 @@ Public Class clsQCSameRCode
clsDollarOperator.AddParameter("right", strParameterValue:=strLengths, bIncludeArgumentName:=False, iPosition:=1)

strCalcName = strlargestSame
clsSameCalcFunction.SetRCommand("instat_calculation$new")
clsSameCalcFunction.SetRCommand("instatCalculations::instat_calculation$new")
clsSameCalcFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsSameCalcFunction.AddParameter("function_exp", clsRFunctionParameter:=clsRepFunc, iPosition:=1)
clsSameCalcFunction.AddParameter("result_name", Chr(34) & strCalcName & Chr(34), iPosition:=4)
Expand All @@ -142,7 +142,7 @@ Public Class clsQCSameRCode
clsSameListFunc.SetRCommand("list")
clsSameListFunc.AddParameter("sub1", clsRFunctionParameter:=clsSameCalcFunction, bIncludeArgumentName:=False)

clsSameTestFunction.SetRCommand("instat_calculation$new")
clsSameTestFunction.SetRCommand("instatCalculations::instat_calculation$new")
clsSameTestFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsSameTestFunction.AddParameter("function_exp", clsROperatorParameter:=clsSameGreaterOperator, iPosition:=1)
clsSameTestFunction.AddParameter("result_name", Chr(34) & strTestName & Chr(34), iPosition:=4)
Expand Down Expand Up @@ -179,7 +179,7 @@ Public Class clsQCDifferenceRCode
clsDiffOperator.SetOperation("-")
clsDiffOperator.bToScriptAsRString = True

clsDiffCalcFunction.SetRCommand("instat_calculation$new")
clsDiffCalcFunction.SetRCommand("instatCalculations::instat_calculation$new")
clsDiffCalcFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsDiffCalcFunction.AddParameter("function_exp", clsROperatorParameter:=clsDiffOperator, iPosition:=1)
clsDiffCalcFunction.AddParameter("result_name", Chr(34) & strDiffCalc & Chr(34), iPosition:=4)
Expand All @@ -188,7 +188,7 @@ Public Class clsQCDifferenceRCode
strTestName = strDiffTest
clsListFunc.SetRCommand("list")
clsListFunc.AddParameter("sub1", bIncludeArgumentName:=False, clsRFunctionParameter:=clsDiffCalcFunction, iPosition:=0)
clsDiffTestFunction.SetRCommand("instat_calculation$new")
clsDiffTestFunction.SetRCommand("instatCalculations::instat_calculation$new")
clsDiffTestFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsDiffTestFunction.AddParameter("function_exp", clsROperatorParameter:=clsLessDiffOperator, iPosition:=1)
clsDiffTestFunction.AddParameter("result_name", Chr(34) & strTestName & Chr(34), iPosition:=4)
Expand Down Expand Up @@ -223,7 +223,7 @@ Public Class clsQCAcceptableRange
clsRangeOrOperator.AddParameter("left", clsROperatorParameter:=clsLessEqualToOperator, iPosition:=0, bIncludeArgumentName:=False)
clsRangeOrOperator.AddParameter("right", clsROperatorParameter:=clsGreaterEqualToOperator, iPosition:=1, bIncludeArgumentName:=False)

clsAcceptableRangeTestFunc.SetRCommand("instat_calculation$new")
clsAcceptableRangeTestFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsAcceptableRangeTestFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsAcceptableRangeTestFunc.AddParameter("function_exp", clsROperatorParameter:=clsRangeOrOperator, iPosition:=1)
clsAcceptableRangeTestFunc.AddParameter("result_name", Chr(34) & strRangeName & Chr(34), iPosition:=4)
Expand Down Expand Up @@ -265,7 +265,7 @@ Public Class clsQcOutliers
strUpperTestName = strOutlierUpperTestCalcName
strLowerTestName = strOutlierLowerTestCalcName

clsOutlierUpperLimitCalc.SetRCommand("instat_calculation$new")
clsOutlierUpperLimitCalc.SetRCommand("instatCalculations::instat_calculation$new")
clsOutlierUpperLimitCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsOutlierUpperLimitCalc.AddParameter("function_exp", clsRFunctionParameter:=clsOutlierUpperLimitFunc, iPosition:=1)
clsOutlierUpperLimitCalc.AddParameter("result_name", Chr(34) & strUpperCalcName & Chr(34), iPosition:=4)
Expand All @@ -275,7 +275,7 @@ Public Class clsQcOutliers
clsOutlierUpperLimitFunc.AddParameter("bupperlimit", "TRUE")
clsOutlierUpperLimitFunc.bToScriptAsRString = True

clsOutlierLowerLimitCalc.SetRCommand("instat_calculation$new")
clsOutlierLowerLimitCalc.SetRCommand("instatCalculations::instat_calculation$new")
clsOutlierLowerLimitCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsOutlierLowerLimitCalc.AddParameter("function_exp", clsRFunctionParameter:=clsOutlierLowerLimitFunc, iPosition:=1)
clsOutlierLowerLimitCalc.AddParameter("result_name", Chr(34) & strLowerCalcName & Chr(34), iPosition:=4)
Expand All @@ -285,7 +285,7 @@ Public Class clsQcOutliers
clsOutlierLowerLimitFunc.AddParameter("bupperlimit", "FALSE")
clsOutlierLowerLimitFunc.bToScriptAsRString = True

clsOutlierLowerLimitTestCalc.SetRCommand("instat_calculation$new")
clsOutlierLowerLimitTestCalc.SetRCommand("instatCalculations::instat_calculation$new")
clsOutlierLowerLimitTestCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsOutlierLowerLimitTestCalc.AddParameter("function_exp", clsROperatorParameter:=clsOutlierLowerOperator, iPosition:=1)
clsOutlierLowerLimitTestCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsOutlierLowerList, iPosition:=2)
Expand All @@ -299,7 +299,7 @@ Public Class clsQcOutliers
clsOutlierLowerOperator.bToScriptAsRString = True
clsOutlierLowerOperator.AddParameter("right", strLowerCalcName, iPosition:=1)

clsOutlierUpperLimitTestCalc.SetRCommand("instat_calculation$new")
clsOutlierUpperLimitTestCalc.SetRCommand("instatCalculations::instat_calculation$new")
clsOutlierUpperLimitTestCalc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsOutlierUpperLimitTestCalc.AddParameter("function_exp", clsROperatorParameter:=clsOutlierUpperOperator, iPosition:=1)
clsOutlierUpperLimitTestCalc.AddParameter("sub_calculations", clsRFunctionParameter:=clsOutlierUpperList, iPosition:=2)
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgCalculationsSummary.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Public Class dlgCalculationsSummary
clsApplyCalculation.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$run_instat_calculation")
clsApplyCalculation.AddParameter("calc", clsRFunctionParameter:=clsNewCalculationFunction)

clsNewCalculationFunction.SetRCommand("instat_calculation$new")
clsNewCalculationFunction.SetRCommand("instatCalculations::instat_calculation$new")
clsNewCalculationFunction.AddParameter("name", Chr(34) & strCalcName & Chr(34))
clsNewCalculationFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34))
clsNewCalculationFunction.AddParameter("save", "2")
Expand Down
38 changes: 19 additions & 19 deletions instat/dlgClimaticCheckDataRain.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,15 +292,15 @@ Public Class dlgClimaticCheckDataRain
bResetSubdialog = True

'Group Function
clsGroupByFunc.SetRCommand("instat_calculation$new")
clsGroupByFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsGroupByFunc.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0)
clsGroupByFunc.SetAssignTo("grouping")

clsListFunc.SetRCommand("list")
clsListFunc.AddParameter("sub1", clsRFunctionParameter:=clsGroupByFunc, bIncludeArgumentName:=False, iPosition:=1)

'Main Filter
clsRainFilterFunc.SetRCommand("instat_calculation$new")
clsRainFilterFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsRainFilterFunc.AddParameter("type", Chr(34) & "filter" & Chr(34), iPosition:=0)
clsRainFilterFunc.AddParameter("function_exp", clsROperatorParameter:=clsOrOperator, iPosition:=1)
clsRainFilterFunc.AddParameter("sub_calculations", clsRFunctionParameter:=clsListSubCalc, iPosition:=2)
Expand All @@ -310,7 +310,7 @@ Public Class dlgClimaticCheckDataRain
clsManuplationDayListFunction.SetRCommand("list")
clsManuplationDayListFunction.AddParameter("list", clsRFunctionParameter:=clsRainFilterFunc, iPosition:=0, bIncludeArgumentName:=False)

clsDayFilterFunc.SetRCommand("instat_calculation$new")
clsDayFilterFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsDayFilterFunc.AddParameter("type", Chr(34) & "filter" & Chr(34), iPosition:=0)
clsDayFilterFunc.AddParameter("function_exp", Chr(34) & "day" & Chr(34), iPosition:=1)
clsDayFilterFunc.AddParameter("sub_calculations", clsRFunctionParameter:=clsListDayFunction, iPosition:=2)
Expand All @@ -337,7 +337,7 @@ Public Class dlgClimaticCheckDataRain
clsLargeLessOperator.SetOperation("<")
clsLargeLessOperator.AddParameter("right", bIncludeArgumentName:=False, strParameterValue:="-1E-8", iPosition:=1)

clsLargeTestCalcFunc.SetRCommand("instat_calculation$new")
clsLargeTestCalcFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsLargeTestCalcFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsLargeTestCalcFunc.AddParameter("function_exp", clsROperatorParameter:=clsOrLargeOperator, iPosition:=1)
clsLargeTestCalcFunc.AddParameter("result_name", Chr(34) & strLargeTest & Chr(34), iPosition:=3)
Expand Down Expand Up @@ -370,13 +370,13 @@ Public Class dlgClimaticCheckDataRain
clsRepFunc.AddParameter("second", bIncludeArgumentName:=False, clsROperatorParameter:=clsDollarOperator, iPosition:=1)
clsRepFunc.bToScriptAsRString = True

clsSameCalcFunc.SetRCommand("instat_calculation$new")
clsSameCalcFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsSameCalcFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsSameCalcFunc.AddParameter("function_exp", clsRFunctionParameter:=clsRepFunc, iPosition:=1)
clsSameCalcFunc.AddParameter("result_name", Chr(34) & strSameCalc & Chr(34), iPosition:=3)
clsSameCalcFunc.SetAssignTo("same_calculation")

clsSameTestFunc.SetRCommand("instat_calculation$new")
clsSameTestFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsSameTestFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsSameTestFunc.AddParameter("function_exp", clsROperatorParameter:=clsAndOperator, iPosition:=1)
clsSameTestFunc.AddParameter("sub_calculations", clsRFunctionParameter:=clsSameList, iPosition:=2)
Expand Down Expand Up @@ -415,13 +415,13 @@ Public Class dlgClimaticCheckDataRain
clsMultipleOperator.AddParameter("left", clsROperatorParameter:=clsEqualOperator, iPosition:=0)
clsMultipleOperator.AddParameter("right", clsRFunctionParameter:=clsCumSumFuc, iPosition:=1)

clsCumulativeCalcFunc.SetRCommand("instat_calculation$new")
clsCumulativeCalcFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsCumulativeCalcFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsCumulativeCalcFunc.AddParameter("function_exp", clsROperatorParameter:=clsMinusOperator, iPosition:=1)
clsCumulativeCalcFunc.AddParameter("result_name", Chr(34) & strCumulativeCalc & Chr(34), iPosition:=3)
clsCumulativeCalcFunc.SetAssignTo("cumulative_calculation")

clsCumulativeTestFunc.SetRCommand("instat_calculation$new")
clsCumulativeTestFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsCumulativeTestFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsCumulativeTestFunc.AddParameter("function_exp", clsROperatorParameter:=clsSecondGreaterOperator, iPosition:=1)
clsCumulativeTestFunc.AddParameter("sub_calculations", clsRFunctionParameter:=clsCumulativeList, iPosition:=2)
Expand All @@ -438,11 +438,11 @@ Public Class dlgClimaticCheckDataRain
clsIsNaFunction.SetRCommand("is.na")

'Group By Month
clsGroupByMonth.SetRCommand("instat_calculation$new")
clsGroupByMonth.SetRCommand("instatCalculations::instat_calculation$new")
clsGroupByMonth.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0)
clsGroupByMonth.SetAssignTo("grouping_month")

clsGroupByMonthYearFunction.SetRCommand("instat_calculation$new")
clsGroupByMonthYearFunction.SetRCommand("instatCalculations::instat_calculation$new")
clsGroupByMonthYearFunction.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0)
clsGroupByMonthYearFunction.SetAssignTo("grouping_month_year")

Expand All @@ -459,13 +459,13 @@ Public Class dlgClimaticCheckDataRain
clsRainyDaysOperator.bBrackets = True
clsRainyDaysOperator.bToScriptAsRString = True

clsRainyDaysFunc.SetRCommand("instat_calculation$new")
clsRainyDaysFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsRainyDaysFunc.AddParameter("type", Chr(34) & "filter" & Chr(34), iPosition:=0)
clsRainyDaysFunc.AddParameter("function_exp", clsROperatorParameter:=clsRainyDaysOperator, iPosition:=0)
clsRainyDaysFunc.SetAssignTo("rainydays_filter")

'upper Outlier Limit function
clsUpperOutlierLimitValueCalcFunc.SetRCommand("instat_calculation$new")
clsUpperOutlierLimitValueCalcFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsUpperOutlierLimitValueCalcFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsUpperOutlierLimitValueCalcFunc.AddParameter("function_exp", clsRFunctionParameter:=clsUpperOutlierLimitFunc, iPosition:=1)
clsUpperOutlierLimitValueCalcFunc.AddParameter("result_name", Chr(34) & strUpperOutlierLimit & Chr(34), iPosition:=4)
Expand All @@ -481,7 +481,7 @@ Public Class dlgClimaticCheckDataRain
clsUpperOutlierOperator.bBrackets = False
clsUpperOutlierOperator.bToScriptAsRString = True

clsUpperOutlierlimitTestFunc.SetRCommand("instat_calculation$new")
clsUpperOutlierlimitTestFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsUpperOutlierlimitTestFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsUpperOutlierlimitTestFunc.AddParameter("function_exp", clsROperatorParameter:=clsUpperOutlierOperator, iPosition:=1)
clsUpperOutlierlimitTestFunc.AddParameter("result_name", Chr(34) & strUpperOutlierTest & Chr(34), iPosition:=3)
Expand All @@ -492,7 +492,7 @@ Public Class dlgClimaticCheckDataRain
clsUpperListOutlier.AddParameter("sub1", clsRFunctionParameter:=clsUpperOutlierLimitValueCalcFunc, bIncludeArgumentName:=False, iPosition:=0)

'lower Outlier Limit function
clsLowerOutlierLimitValueCalcFunc.SetRCommand("instat_calculation$new")
clsLowerOutlierLimitValueCalcFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsLowerOutlierLimitValueCalcFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsLowerOutlierLimitValueCalcFunc.AddParameter("function_exp", clsRFunctionParameter:=clsLowerOutlierLimitFunc, iPosition:=1)
clsLowerOutlierLimitValueCalcFunc.AddParameter("result_name", Chr(34) & strLowerOutlierLimit & Chr(34), iPosition:=4)
Expand All @@ -508,7 +508,7 @@ Public Class dlgClimaticCheckDataRain
clsLowerOutlierOperator.bBrackets = False
clsLowerOutlierOperator.bToScriptAsRString = True

clsLowerOutlierlimitTestFunc.SetRCommand("instat_calculation$new")
clsLowerOutlierlimitTestFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsLowerOutlierlimitTestFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsLowerOutlierlimitTestFunc.AddParameter("function_exp", clsROperatorParameter:=clsLowerOutlierOperator, iPosition:=1)
clsLowerOutlierlimitTestFunc.AddParameter("result_name", Chr(34) & strLowerOutlierTest & Chr(34), iPosition:=3)
Expand All @@ -530,7 +530,7 @@ Public Class dlgClimaticCheckDataRain
clsOrOperator.bToScriptAsRString = True

'Dry Month Calculations
clsFilterMonthFunction.SetRCommand("instat_calculation$new")
clsFilterMonthFunction.SetRCommand("instatCalculations::instat_calculation$new")
clsFilterMonthFunction.AddParameter("type", Chr(34) & "filter" & Chr(34), iPosition:=0)
clsFilterMonthFunction.AddParameter("function_exp", clsROperatorParameter:=clsInOperator, iPosition:=1)
clsFilterMonthFunction.SetAssignTo("filter_months")
Expand All @@ -544,14 +544,14 @@ Public Class dlgClimaticCheckDataRain
clsNotOperator.bSpaceAroundOperation = False
clsNotOperator.AddParameter("space", "", iPosition:=0)

clsDryMonthCalculationFunc.SetRCommand("instat_calculation$new")
clsDryMonthCalculationFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsDryMonthCalculationFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsDryMonthCalculationFunc.AddParameter("function_exp", clsROperatorParameter:=clsDryMonthAndOperator, iPosition:=1)
clsDryMonthCalculationFunc.AddParameter("manipulations", clsRFunctionParameter:=clsListCalcFunction, iPosition:=3)
clsDryMonthCalculationFunc.AddParameter("result_name", Chr(34) & strDryMonthCalc & Chr(34), iPosition:=4)
clsDryMonthCalculationFunc.SetAssignTo("dry_month_calculation")

clsDayFilterCalcFunction.SetRCommand("instat_calculation$new")
clsDayFilterCalcFunction.SetRCommand("instatCalculations::instat_calculation$new")
clsDayFilterCalcFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsDayFilterCalcFunction.AddParameter("function_exp", clsROperatorParameter:=clsDayEqualOperator, iPosition:=1)
clsDayFilterCalcFunction.AddParameter("manipulations", clsRFunctionParameter:=clsManuplationDayListFunction, iPosition:=3)
Expand Down Expand Up @@ -590,7 +590,7 @@ Public Class dlgClimaticCheckDataRain

clsNotIsNaFunction.SetRCommand("!is.na")

clsDryMonthTestCalculationFunc.SetRCommand("instat_calculation$new")
clsDryMonthTestCalculationFunc.SetRCommand("instatCalculations::instat_calculation$new")
clsDryMonthTestCalculationFunc.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0)
clsDryMonthTestCalculationFunc.AddParameter("function_exp", clsROperatorParameter:=clsDryTestAndOperator, iPosition:=1)
clsDryMonthTestCalculationFunc.AddParameter("sub_calculations", clsRFunctionParameter:=clsListTestFunction, iPosition:=3)
Expand Down
Loading
Loading