Changeset 3461
- Timestamp:
- 19/02/08 16:22:40 (13 years ago)
- Location:
- nappy/trunk/nappy/na_file
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
nappy/trunk/nappy/na_file/na_file.py
r3446 r3461 79 79 self.delimiter = delimiter 80 80 self.float_format = float_format 81 self.format = float_format + delimiter 81 82 # Raise errors if dangerous behaviour 82 83 if self.mode != "w": -
nappy/trunk/nappy/na_file/na_file_1001.py
r3440 r3461 81 81 """ 82 82 for m in range(len(self.X)): 83 var_string = "%s"% self.X[m]83 var_string = self.format % self.X[m] 84 84 85 85 for n in range(self.NV): 86 var_string = var_string + ( "%s%s" % (self.delimiter, self.V[n][m]))86 var_string = var_string + (self.format % self.V[n][m]) 87 87 88 self.file.write("%s\n" % var_string )88 self.file.write("%s\n" % var_string.rstrip(" ,")) -
nappy/trunk/nappy/na_file/na_file_1010.py
r3437 r3461 98 98 for m in range(len(self.X)): 99 99 # Write Independent variable mark and auxiliary variables 100 var_string = "%s"% self.X[m]100 var_string = self.format % self.X[m] 101 101 102 102 for a in range(self.NAUXV): 103 var_string = var_string + ( "%s%s" % (self.delimiter, self.A[a][m]))103 var_string = var_string + (self.format % self.A[a][m]) 104 104 105 self.file.write("%s\n" % var_string )105 self.file.write("%s\n" % var_string.rstrip(" ,")) 106 106 107 107 # Write dependant variables 108 108 var_string = "" 109 109 for n in range(self.NV): 110 var_string = var_string + ( "%s%s" % (self.V[n][m], self.delimiter))110 var_string = var_string + (self.format % self.V[n][m]) 111 111 112 112 self.file.write("%s\n" % var_string.rstrip(' ,')) -
nappy/trunk/nappy/na_file/na_file_1020.py
r3437 r3461 87 87 for m in range(len(self.X)): 88 88 # Write Independent variable mark and auxiliary variables 89 var_string = "%s"% self.X[m]89 var_string = self.format % self.X[m] 90 90 91 91 for a in range(self.NAUXV): 92 var_string = var_string + ( "%s%s" % (self.delimiter, self.A[a][m]))92 var_string = var_string + (self.format % self.A[a][m]) 93 93 94 self.file.write("%s\n" % var_string )94 self.file.write("%s\n" % var_string.rstrip(" ,")) 95 95 96 # Write dependant variables .96 # Write dependant variables 97 97 count = 0 98 98 for n in range(self.NV): … … 101 101 for p in range(self.NVPM): 102 102 var_ind = (m * self.NVPM) + p 103 var_string = var_string + ( "%s%s" % (self.V[n][var_ind], self.delimiter))103 var_string = var_string + (self.format % self.V[n][var_ind]) 104 104 count = count + 1 105 105 -
nappy/trunk/nappy/na_file/na_file_2010.py
r3446 r3461 64 64 65 65 for i in range(self.NIV - 1): 66 X_lines.append(( (self.float_format + self.delimiter) * self.NXDEF[i] + "\n") % tuple(self.X[i + 1][0:self.NXDEF[i]]))66 X_lines.append((self.format * self.NXDEF[i] % tuple(self.X[i + 1][0:self.NXDEF[i]])).rstrip(" ,") + "\n") 67 67 68 68 X_lines.reverse() … … 128 128 # Set up unbounded IV loop 129 129 self.NX.reverse() 130 print "self.V is", self.V131 130 for m in range(len(self.X[0])): 132 # Write slower varying independent variable mark and auxiliary variables 133 var_string = self.float_format % self.X[0][m] 131 132 # Write unbounded independent variable mark and auxiliary variables 133 var_string = self.format % self.X[0][m] 134 134 135 135 for a in range(self.NAUXV): 136 var_string = var_string + ( (self.delimiter + self.float_format)% self.A[a][m])137 self.file.write("%s\n" % var_string )136 var_string = var_string + (self.format % self.A[a][m]) 137 self.file.write("%s\n" % var_string.rstrip(" ,")) 138 138 139 139 # Write Variables 140 140 for n in range(self.NV): 141 print "V[n][m] is %s" % self.V[n][m]142 141 outlines = nappy.utils.list_manipulator.recursiveListWriter(self.V[n][m], self.NX, delimiter = self.delimiter, float_format = self.float_format) 143 print "outlines is", outlines144 142 for line in outlines: 145 143 self.file.write(line) -
nappy/trunk/nappy/na_file/na_file_2110.py
r3414 r3461 42 42 self._writeCommonHeader() 43 43 self.DX.reverse() 44 self.header.write(( "%s " * self.NIV + "\n") % tuple(self.DX))44 self.header.write((("%s" + self.delimiter) * (self.NIV - 1) + "%s\n") % tuple(self.DX)) 45 45 self.XNAME.reverse() 46 46 self.header.write("%s\n" * self.NIV % tuple(self.XNAME)) … … 113 113 """ 114 114 # Set up unbounded IV loop 115 # self.NX.reverse() 115 116 116 for m in range(len(self.X)): 117 # Write Independent variable mark and auxiliary variables 118 var_string = "%s " % self.X[m][0] 117 118 # Write unbounded independent variable mark and auxiliary variables 119 var_string = self.format % self.X[m][0] 119 120 120 121 for a in range(self.NAUXV): 121 var_string = var_string + ("%s " % self.A[a][m]) 122 123 self.file.write("%s\n" % var_string.rstrip()) 122 var_string = var_string + (self.format % self.A[a][m]) 123 self.file.write("%s\n" % var_string.rstrip(" ,")) 124 124 125 125 # Write second independant variable and dependant variables 126 126 for p in range(self.NX[m]): 127 var_string = "%s "% self.X[m][1][p]127 var_string = self.format % self.X[m][1][p] 128 128 129 129 for n in range(self.NV): 130 var_string = var_string + ( "%s "%self.V[n][m][p])130 var_string = var_string + (self.format %self.V[n][m][p]) 131 131 132 self.file.write("%s \n" %var_string)132 self.file.write("%s\n" %var_string.rstrip(" ,")) -
nappy/trunk/nappy/na_file/na_file_2160.py
r3414 r3461 61 61 self.header.write("%s\n" % self.NAUXC) 62 62 if self.NAUXV > 0: 63 self.header.write(( "%s " * (self.NAUXV - self.NAUXC) + "\n") % tuple(self.ASCAL))64 self.header.write(( "%s " * (self.NAUXV - self.NAUXC) + "\n") % tuple(self.AMISS[0:(self.NAUXV - self.NAUXC)]))65 self.header.write(( "%s " * self.NAUXC + "\n") % tuple(self.LENA[(self.NAUXV - self.NAUXC):]))63 self.header.write((("%s" + self.delimiter) * (self.NAUXV - self.NAUXC - 1) + "%s\n") % tuple(self.ASCAL)) 64 self.header.write((("%s" + self.delimiter) * (self.NAUXV - self.NAUXC - 1) + "%s\n") % tuple(self.AMISS[0:(self.NAUXV - self.NAUXC)])) 65 self.header.write((("%s" + self.delimiter) * (self.NAUXC - 1) + "%s\n") % tuple(self.LENA[(self.NAUXV - self.NAUXC):])) 66 66 self.header.write(("%s\n" * self.NAUXC) % tuple(self.AMISS[(self.NAUXV - self.NAUXC):])) 67 67 self.header.write("%s\n" * self.NAUXV % tuple(self.ANAME)) … … 119 119 # Set up unbounded IV loop 120 120 for m in range(len(self.X)): 121 121 122 # Write Independent variable mark and auxiliary variables 122 var_string = "%s 123 self.file.write("%s\n" % var_string.rstrip( ))123 var_string = "%s" % self.X[m][0] 124 self.file.write("%s\n" % var_string.rstrip(" ,")) 124 125 var_string = "" 125 126 126 127 for a in range(self.NAUXV - self.NAUXC): 127 var_string = var_string + ( "%s "% self.A[a][m])128 var_string = var_string + (self.format % self.A[a][m]) 128 129 129 self.file.write("%s\n" % var_string.rstrip( ))130 self.file.write("%s\n" % var_string.rstrip(" ,")) 130 131 131 132 for a in range(self.NAUXC): 132 var_string = ( "%s "% self.A[(self.NAUXV - self.NAUXC) + a][m])133 self.file.write("%s\n" % var_string.rstrip( ))133 var_string = (("%s" + self.delimiter) % self.A[(self.NAUXV - self.NAUXC) + a][m]) 134 self.file.write("%s\n" % var_string.rstrip(" ,")) 134 135 135 136 # Write second independant variable and dependant variables 136 137 for p in range(self.NX[m]): 137 var_string = "%s%s" % (self.X[m][1][p], self.delimiter) 138 var_string = self.format % self.X[m][1][p] 139 138 140 for n in range(self.NV): 139 var_string = var_string + ( "%s "% self.V[n][m][p])141 var_string = var_string + (self.format % self.V[n][m][p]) 140 142 141 self.file.write("%s \n" % var_string)143 self.file.write("%s\n" % var_string.rstrip(" ,")) -
nappy/trunk/nappy/na_file/na_file_2310.py
r3414 r3461 97 97 for m in range(len(self.X)): 98 98 # Write Independent variable mark and auxiliary variables 99 var_string = "%s " % self.X[m][0] 99 var_string = self.format % self.X[m][0] 100 100 101 for a in range(self.NAUXV): 101 var_string = var_string + ( "%s "% self.A[a][m])102 self.file.write("%s\n" % var_string.rstrip( ))102 var_string = var_string + (self.format % self.A[a][m]) 103 self.file.write("%s\n" % var_string.rstrip(" ,")) 103 104 104 105 # Write second independant variable and dependant variables … … 106 107 for p in range(self.NX[m]): 107 108 for n in range(self.NV): 108 var_string = var_string + ("%s " %self.V[n][m][p]) 109 110 self.file.write("%s \n" %var_string) 109 var_string = var_string + (self.format %self.V[n][m][p]) 110 self.file.write("%s\n" %var_string.rstrip(" ,"))
Note: See TracChangeset
for help on using the changeset viewer.