From 96274099ef3b9e6d2e80acdea5a54a05eaf007a5 Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Wed, 23 Nov 2016 10:30:54 +0100
Subject: [PATCH] #4014 Bug fixed when StartParamList or StartParamDistrib
arguments are used in the CreateCalibOptions() function
---
R/CreateCalibOptions.R | 2 --
1 file changed, 2 deletions(-)
diff --git a/R/CreateCalibOptions.R b/R/CreateCalibOptions.R
index 3e78a2b5..57cae42c 100644
--- a/R/CreateCalibOptions.R
+++ b/R/CreateCalibOptions.R
@@ -136,7 +136,6 @@ CreateCalibOptions <- function(FUN_MOD, FUN_CALIB = Calibration_Michel, FUN_TRAN
StartParamList <- NULL;
StartParamDistrib <- TransfoParam(ParamIn=ParamT,Direction="TR",FUN_TRANSFO=FUN_TRANSFO);
- StartParam <- StartParamDistrib[2,];
}
##check_StartParamList_and_StartParamDistrib__format
@@ -156,7 +155,6 @@ CreateCalibOptions <- function(FUN_MOD, FUN_CALIB = Calibration_Michel, FUN_TRAN
##Create_CalibOptions
CalibOptions <- list(FixedParam=FixedParam,SearchRanges=SearchRanges);
- if(!is.null(StartParam )){ CalibOptions <- c(CalibOptions,list(StartParam=StartParam)); }
if(!is.null(StartParamList )){ CalibOptions <- c(CalibOptions,list(StartParamList=StartParamList)); }
if(!is.null(StartParamDistrib)){ CalibOptions <- c(CalibOptions,list(StartParamDistrib=StartParamDistrib)); }
class(CalibOptions) <- c("CalibOptions",ObjectClass);
--
GitLab