From 2c6fbe3e8fcef11df91b5a82b88929164bbd84de Mon Sep 17 00:00:00 2001 From: Ryan McGee Date: Thu, 5 Mar 2020 11:14:54 -0800 Subject: [PATCH] Changing prints to python3 style --- .DS_Store | Bin 6148 -> 6148 bytes pycrobe/betalactamase.py | 50 +++++++++++++++--------------- pycrobe/standard.py | 64 +++++++++++++++++++-------------------- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.DS_Store b/.DS_Store index f985748cd97a1bdd5d4c3f4c71f4acb0c11bfa3d..9e5db7f7caae5aa7bd55820b26ea0ce53a13c900 100644 GIT binary patch delta 311 zcmZoMXfc=|#>B)qu~2NHo}wrl0|Nsi1A_nqLq0%}Xf; z8x#zY;o#up;EWd#udX)GQ82YIs?|}bHZ(H=a!gFjYHK+;#8nM#Jri;(tEy{i>t+BQ w3j~ZnUxEQYl!j3=H}f!xvTkPQ;O77a3()J|nJ4p$SaJZ>gSBi95ZS^E06?HnGynhq delta 83 zcmZoMXfc=|#>B`mu~2NHo}wr#0|Nsi1A_nqLq00): for drug in self.drugs: - print "\tDrug " + drug.name + ":\n" + "\t\tconcentration\t= " + ("%.3f" % drug.concentration) + " ug/mL" + print("\tDrug " + drug.name + ":\n" + "\t\tconcentration\t= " + ("%.3f" % drug.concentration) + " ug/mL") else: - print "\t(no drugs)" + print("\t(no drugs)") #---------- if(len(self.solutes)>0): for solute in self.solutes: - print "\tSolute " + solute.name + ":\n" + "\t\tconcentration\t= " + (("%.3f" % solute.concentration) if solute.concentration>0.001 else ("%.2E" % solute.concentration)) + " ug/mL" + print("\tSolute " + solute.name + ":\n" + "\t\tconcentration\t= " + (("%.3f" % solute.concentration) if solute.concentration>0.001 else ("%.2E" % solute.concentration)) + " ug/mL") else: - print "\t(no other solutes)" + print("\t(no other solutes)") @@ -462,14 +462,14 @@ def run(self, time, dt, inoculums, media, temp, noise_r=0.0, downsample_output_d growthPhase[i] = 'exponential' - # print "N["+str(t)+"] = " + str(N[t]) - # print "r["+str(t)+"] = " + str(r[t]) - # print "S["+str(t)+"] = " + str(S[t]) - # print "------------------------------" - # print "N["+str(t+1)+"] = " + str(N[t+1]) - # print "r["+str(t+1)+"] = " + str(r[t+1]) - # print "S["+str(t+1)+"] = " + str(S[t+1]) - # print "==============================" + # print("N["+str(t)+"] = " + str(N[t])) + # print("r["+str(t)+"] = " + str(r[t])) + # print("S["+str(t)+"] = " + str(S[t])) + # print("------------------------------") + # print("N["+str(t+1)+"] = " + str(N[t+1])) + # print("r["+str(t+1)+"] = " + str(r[t+1])) + # print("S["+str(t+1)+"] = " + str(S[t+1])) + # print("==============================") #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -726,18 +726,18 @@ def totalCellDensity(self): def info(self): - print "Culture " + self.name + ":" - print "--------------------------------" - print "\tVolume\t\t\t= " + ("%.3f" % self.totalVolume()) + " mL" - print "\tDensity\t\t\t= " + ( '%.2E' % Decimal(str( self.totalCellDensity() )) ) + " cfu/mL" - print "\tTotal CellCount\t= " + ( '%.2E' % Decimal(str( self.totalCellCount() )) ) + " cfu" + print("Culture " + self.name + ":") + print("--------------------------------") + print("\tVolume\t\t\t= " + ("%.3f" % self.totalVolume()) + " mL") + print("\tDensity\t\t\t= " + ( '%.2E' % Decimal(str( self.totalCellDensity() )) ) + " cfu/mL") + print("\tTotal CellCount\t= " + ( '%.2E' % Decimal(str( self.totalCellCount() )) ) + " cfu") #---------- if(len(self.inoculums)>0): inoculumDensities = self.getInoculumDensities() for inoculum in self.inoculums: - print "\tInoculum " + inoculum.strain.name + ":\n" + "\t\tdensity\t\t= " + ( '%.2E' % Decimal(str( inoculumDensities[inoculum.strain.name] )) )+" cfu/mL" + "\n\t\tcell count\t= " + ( '%.2E' % Decimal(str( inoculum.cellCount )) )+" cfu" + "\n\t\tfrequency\t= " + ( '%.4f' % self.getInoculumFrequencies()[inoculum.strain.name] ) + "" + "\n\t\tgrowthPhase\t= " + inoculum.growthPhase + print("\tInoculum " + inoculum.strain.name + ":\n" + "\t\tdensity\t\t= " + ( '%.2E' % Decimal(str( inoculumDensities[inoculum.strain.name] )) )+" cfu/mL" + "\n\t\tcell count\t= " + ( '%.2E' % Decimal(str( inoculum.cellCount )) )+" cfu" + "\n\t\tfrequency\t= " + ( '%.4f' % self.getInoculumFrequencies()[inoculum.strain.name] ) + "" + "\n\t\tgrowthPhase\t= " + inoculum.growthPhase) else: - print "\t(no inoculums)" + print("\t(no inoculums)") #---------- self.media.info() @@ -783,12 +783,12 @@ def incubate(self, cultures, time, dt, record_growth_curves=False): for c, culture in enumerate(cultures): culture.incubate(time=dt, dt=dt, temp=effectiveTemps[c]) - print "N["+str(t)+"] = " + str(culture.inoculums[0].cellCount) - print "r["+str(t)+"] = " + str(culture.inoculums[0].growthRate) - print "phase["+str(t)+"] = " + str(culture.inoculums[0].growthPhase) - print "timer["+str(t)+"] = " + str(culture.inoculums[0].growthCycleTimer) - print "END INCUBATOR T = "+str(t) - print "------------------------------" + print("N["+str(t)+"] = " + str(culture.inoculums[0].cellCount)) + print("r["+str(t)+"] = " + str(culture.inoculums[0].growthRate)) + print("phase["+str(t)+"] = " + str(culture.inoculums[0].growthPhase)) + print("timer["+str(t)+"] = " + str(culture.inoculums[0].growthCycleTimer)) + print("END INCUBATOR T = "+str(t)) + print("------------------------------") if(culture.media.nutrient.concentration <= 1e-1): culture.info() exit() @@ -898,13 +898,13 @@ def totalColonyCount(self): def info(self): - print "AgarPlate " + self.name + ":" - print "--------------------------------" - print "\tTotal Colonies = " + str(self.totalColonyCount()) + print("AgarPlate " + self.name + ":") + print("--------------------------------") + print("\tTotal Colonies = " + str(self.totalColonyCount())) for marker in numpy.unique([inoculum.strain.marker for inoculum in self.inoculums]): - print "\tMarker " + marker + ":\n" + "\t\tcell count\t= " + str( self.getColonyCounts()[marker] ) + print("\tMarker " + marker + ":\n" + "\t\tcell count\t= " + str( self.getColonyCounts()[marker] )) # for inoculum in self.inoculums: - # print "\tInoculum " + inoculum.strain.name + ":\n" + "\t\tcell count\t= " + str( self.getColonyCounts()[inoculum.strain.marker] ) + # print("\tInoculum " + inoculum.strain.name + ":\n" + "\t\tcell count\t= " + str( self.getColonyCounts()[inoculum.strain.marker] )) ##################################################