From b36ba9281536e20e81159d3bc858fafd79eb24a1 Mon Sep 17 00:00:00 2001 From: Bryan Daniels Date: Wed, 13 Apr 2022 13:03:21 -0700 Subject: [PATCH] time.clock -> time.time --- SirIsaac/fittingProblem.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SirIsaac/fittingProblem.py b/SirIsaac/fittingProblem.py index 5ed4b40..928bf14 100644 --- a/SirIsaac/fittingProblem.py +++ b/SirIsaac/fittingProblem.py @@ -1609,7 +1609,7 @@ def fitToData(self,fittingData,indepParamsList=[[]], if self.verbose: print("SloppyCellFittingModel.fitToData: " \ "using ensemble stored in self.ensemble.") elif self.ensGen != None: - startTimeEns = time.clock() + startTimeEns = time.time() if self.numprocs > 1: ens,ratio = self.ensGen.generateEnsemble_parallel(self.numprocs, dataModel,initialParameters,verbose=self.verbose) @@ -1620,7 +1620,7 @@ def fitToData(self,fittingData,indepParamsList=[[]], print("SloppyCellFittingModel.fitToData: Ensemble generation " \ "failed. Using self.initialParameters.") ens = [self.initialParameters] - ensTimeSeconds = time.clock() - startTimeEns + ensTimeSeconds = time.time() - startTimeEns self.ensTimeSecondsList.append(ensTimeSeconds) else: ens = [initialParameters] @@ -1657,7 +1657,7 @@ def fitToData(self,fittingData,indepParamsList=[[]], self.convFlagList,self.costList = [],[] for index,params in enumerate(ens): #self.initializeParameters(params) - startTime = time.clock() + startTime = time.time() if fittingDataDerivs is None: fitParams,convFlag,cost,numCostCalls,numGradCalls,Lmbda,j = \ @@ -1676,7 +1676,7 @@ def fitToData(self,fittingData,indepParamsList=[[]], self.afterMinCostDict[index] = afterMinCostList self.afterExpCostDict[index] = afterExpCostList - minimizationTimeSeconds = time.clock() - startTime + minimizationTimeSeconds = time.time() - startTime self.minimizationTimeSecondsList.append(minimizationTimeSeconds) if fittingDataDerivs is not None: