Commit 96274099 authored by unknown's avatar unknown
Browse files

#4014 Bug fixed when StartParamList or StartParamDistrib arguments are used...

#4014 Bug fixed when StartParamList or   StartParamDistrib arguments are used in the CreateCalibOptions() function
Showing with 0 additions and 2 deletions
+0 -2
...@@ -136,7 +136,6 @@ CreateCalibOptions <- function(FUN_MOD, FUN_CALIB = Calibration_Michel, FUN_TRAN ...@@ -136,7 +136,6 @@ CreateCalibOptions <- function(FUN_MOD, FUN_CALIB = Calibration_Michel, FUN_TRAN
StartParamList <- NULL; StartParamList <- NULL;
StartParamDistrib <- TransfoParam(ParamIn=ParamT,Direction="TR",FUN_TRANSFO=FUN_TRANSFO); StartParamDistrib <- TransfoParam(ParamIn=ParamT,Direction="TR",FUN_TRANSFO=FUN_TRANSFO);
StartParam <- StartParamDistrib[2,];
} }
##check_StartParamList_and_StartParamDistrib__format ##check_StartParamList_and_StartParamDistrib__format
...@@ -156,7 +155,6 @@ CreateCalibOptions <- function(FUN_MOD, FUN_CALIB = Calibration_Michel, FUN_TRAN ...@@ -156,7 +155,6 @@ CreateCalibOptions <- function(FUN_MOD, FUN_CALIB = Calibration_Michel, FUN_TRAN
##Create_CalibOptions ##Create_CalibOptions
CalibOptions <- list(FixedParam=FixedParam,SearchRanges=SearchRanges); 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(StartParamList )){ CalibOptions <- c(CalibOptions,list(StartParamList=StartParamList)); }
if(!is.null(StartParamDistrib)){ CalibOptions <- c(CalibOptions,list(StartParamDistrib=StartParamDistrib)); } if(!is.null(StartParamDistrib)){ CalibOptions <- c(CalibOptions,list(StartParamDistrib=StartParamDistrib)); }
class(CalibOptions) <- c("CalibOptions",ObjectClass); class(CalibOptions) <- c("CalibOptions",ObjectClass);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment