From 16c74add6f33e8e3e2bf2fa026d2c6d9162f92ad Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Wed, 23 Apr 2025 13:03:53 +0200 Subject: [PATCH] - nei risultati si restituisce anche il timetomachine, dove calcolato --- Strategies/Standard/STR0003/STR0003.lua | 8 ++++---- Strategies/Standard/STR0004/STR0004.lua | 4 ++-- Strategies/Standard/STR0005/STR0005.lua | 1 + StrategyLibs/BLADEKEEPWASTE.lua | 4 ++-- StrategyLibs/BLADETOWASTE.lua | 10 ++++------ 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Strategies/Standard/STR0003/STR0003.lua b/Strategies/Standard/STR0003/STR0003.lua index 598e15f..e433f9c 100644 --- a/Strategies/Standard/STR0003/STR0003.lua +++ b/Strategies/Standard/STR0003/STR0003.lua @@ -324,8 +324,8 @@ function STR0003.Make( bAddMachining, Proc, Part, CustomParameters) Strategy.Result.nQuality = FeatureLib.GetStrategyQuality( Blade.Result.Sorted) Strategy.Result.dCompletionPercentage = dAreaToMachineBlade / LongFace.dArea * 100 Strategy.Result.nCompletionIndex = FeatureLib.GetFeatureCompletionIndex( Strategy.Result.dCompletionPercentage) - local dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Blade.Result.Sorted) - Strategy.Result.dMRR = ( dFeatureVolume / dTimeToMachine) / pow( 10, 6) + Strategy.Result.dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Blade.Result.Sorted) + Strategy.Result.dMRR = ( dFeatureVolume / Strategy.Result.dTimeToMachine) / pow( 10, 6) if #Blade.Result.Sorted > 0 then if not Strategy.Parameters.bNotCompleteWithBladeRadius and Cutting.dCompletionPercentage > 100 - 10 * GEO.EPS_SMALL then Strategy.Result.sStatus = 'Completed' @@ -674,8 +674,8 @@ function STR0003.Make( bAddMachining, Proc, Part, CustomParameters) Strategy.Result.sStatus = 'Not-Completed' end Strategy.Result.nQuality = FeatureLib.GetStrategyQuality( Result) - local dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Result) - Strategy.Result.dMRR = ( dFeatureVolume / dTimeToMachine) / pow( 10, 6) + Strategy.Result.dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Result) + Strategy.Result.dMRR = ( dFeatureVolume / Strategy.Result.dTimeToMachine) / pow( 10, 6) else Strategy.Result = FeatureLib.GetStrategyResultNotApplicable() end diff --git a/Strategies/Standard/STR0004/STR0004.lua b/Strategies/Standard/STR0004/STR0004.lua index cfd9589..131b668 100644 --- a/Strategies/Standard/STR0004/STR0004.lua +++ b/Strategies/Standard/STR0004/STR0004.lua @@ -313,8 +313,8 @@ function STR0004.Make( bAddMachining, Proc, Part, CustomParameters) Strategy.Result.sStatus = 'Not-Completed' end Strategy.Result.nQuality = FeatureLib.GetStrategyQuality( Chainsaw.Result.Sorted) - local dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Chainsaw.Result.Sorted) - Strategy.Result.dMRR = ( dFeatureVolume / dTimeToMachine) / pow( 10, 6) + Strategy.Result.dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Chainsaw.Result.Sorted) + Strategy.Result.dMRR = ( dFeatureVolume / Strategy.Result.dTimeToMachine) / pow( 10, 6) else Strategy.Result = FeatureLib.GetStrategyResultNotApplicable() end diff --git a/Strategies/Standard/STR0005/STR0005.lua b/Strategies/Standard/STR0005/STR0005.lua index 436027b..7e1b851 100644 --- a/Strategies/Standard/STR0005/STR0005.lua +++ b/Strategies/Standard/STR0005/STR0005.lua @@ -124,6 +124,7 @@ function STR0005.Make( bAddMachining, Proc, Part, CustomParameters) end -- lavorazione eventuale terza faccia tipo RidgeLap + -- TODO da completare -- TODO va messa per prima???????? if idAddedTmFace then local dMinZTopBlade diff --git a/StrategyLibs/BLADEKEEPWASTE.lua b/StrategyLibs/BLADEKEEPWASTE.lua index be9e2e5..3c2c364 100644 --- a/StrategyLibs/BLADEKEEPWASTE.lua +++ b/StrategyLibs/BLADEKEEPWASTE.lua @@ -257,8 +257,8 @@ function BLADEKEEPWASTE.Make( Proc, Part, OptionalParameters) -- calcolo risultati if Cutting1.bIsApplicable or Cutting2.bIsApplicable then Result.nQuality = FeatureLib.GetStrategyQuality( Machinings) - local dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Machinings) - Result.dMRR = ( dFeatureVolume / dTimeToMachine) / pow( 10, 6) + Result.dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Machinings) + Result.dMRR = ( dFeatureVolume / Result.dTimeToMachine) / pow( 10, 6) if Result.dCompletionPercentage > 100 - 10 * GEO.EPS_SMALL then Result.sStatus = 'Completed' else diff --git a/StrategyLibs/BLADETOWASTE.lua b/StrategyLibs/BLADETOWASTE.lua index 77fbba5..0029878 100644 --- a/StrategyLibs/BLADETOWASTE.lua +++ b/StrategyLibs/BLADETOWASTE.lua @@ -302,8 +302,8 @@ local function CutWholeWaste( Proc, Part, OptionalParameters) Result.dCompletionPercentage = dCompletionPercentage Result.nCompletionIndex = FeatureLib.GetFeatureCompletionIndex( dCompletionPercentage) Result.nQuality = TOOLS[nToolIndex].nQuality - local dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( {Cutting}) - Result.dMRR = ( FeatureInfo.dFeatureVolume / dTimeToMachine) / pow( 10, 6) + Result.dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( {Cutting}) + Result.dMRR = ( FeatureInfo.dFeatureVolume / Result.dTimeToMachine) / pow( 10, 6) return Machinings, Result end @@ -547,7 +547,6 @@ function BLADETOWASTE.Make( ProcOrId, Part, OptionalParameters) end -- risultati del calcolo - -- TODO contemplare il caso di lavorazione incompleta per i cubetti????? if bIsDicingOk then Result.sStatus = 'Completed' Result.dCompletionPercentage = 100 @@ -555,10 +554,9 @@ function BLADETOWASTE.Make( ProcOrId, Part, OptionalParameters) Result = FeatureLib.GetStrategyResultNotApplicable() end Result.nQuality = TOOLS[nToolIndex].nQuality - local dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Machinings) - Result.dMRR = ( FeatureInfo.dFeatureVolume / dTimeToMachine) / pow( 10, 6) + Result.dTimeToMachine = FeatureLib.GetStrategyTimeToMachine( Machinings) + Result.dMRR = ( FeatureInfo.dFeatureVolume / Result.dTimeToMachine) / pow( 10, 6) - -- restituire tabella contenente lavorazioni, già con cloni se necessari return Machinings, Result end