Skip to content

Commit

Permalink
time.clock -> time.time
Browse files Browse the repository at this point in the history
  • Loading branch information
bcdaniels committed Apr 13, 2022
1 parent 2cf666a commit b36ba92
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions SirIsaac/fittingProblem.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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]
Expand Down Expand Up @@ -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 = \
Expand All @@ -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:
Expand Down

0 comments on commit b36ba92

Please sign in to comment.