@@ -29,13 +29,13 @@ def test_str(self):
29
29
test for toString() method
30
30
"""
31
31
x = Vector ([0 ,0 ,0 ,0 ,0 ,1 ])
32
- self .assertEqual (x . __str__ ( ),"(0,0,0,0,0,1)" )
32
+ self .assertEqual (str ( x ),"(0,0,0,0,0,1)" )
33
33
def test_size (self ):
34
34
"""
35
35
test for size()-method
36
36
"""
37
37
x = Vector ([1 ,2 ,3 ,4 ])
38
- self .assertEqual (x . size ( ),4 )
38
+ self .assertEqual (len ( x ),4 )
39
39
def test_euclidLength (self ):
40
40
"""
41
41
test for the eulidean length
@@ -67,67 +67,67 @@ def test_mul(self):
67
67
x = Vector ([1 ,2 ,3 ])
68
68
a = Vector ([2 ,- 1 ,4 ]) # for test of dot-product
69
69
b = Vector ([1 ,- 2 ,- 1 ])
70
- self .assertEqual ((x * 3.0 ). __str__ ( ),"(3.0,6.0,9.0)" )
70
+ self .assertEqual (str (x * 3.0 ),"(3.0,6.0,9.0)" )
71
71
self .assertEqual ((a * b ),0 )
72
72
def test_zeroVector (self ):
73
73
"""
74
74
test for the global function zeroVector(...)
75
75
"""
76
- self .assertTrue (zeroVector (10 ). __str__ ( ).count ("0" ) == 10 )
76
+ self .assertTrue (str ( zeroVector (10 )).count ("0" ) == 10 )
77
77
def test_unitBasisVector (self ):
78
78
"""
79
79
test for the global function unitBasisVector(...)
80
80
"""
81
- self .assertEqual (unitBasisVector (3 ,1 ). __str__ ( ),"(0,1,0)" )
81
+ self .assertEqual (str ( unitBasisVector (3 ,1 )),"(0,1,0)" )
82
82
def test_axpy (self ):
83
83
"""
84
84
test for the global function axpy(...) (operation)
85
85
"""
86
86
x = Vector ([1 ,2 ,3 ])
87
87
y = Vector ([1 ,0 ,1 ])
88
- self .assertEqual (axpy (2 ,x ,y ). __str__ ( ),"(3,4,7)" )
88
+ self .assertEqual (str ( axpy (2 ,x ,y )),"(3,4,7)" )
89
89
def test_copy (self ):
90
90
"""
91
91
test for the copy()-method
92
92
"""
93
93
x = Vector ([1 ,0 ,0 ,0 ,0 ,0 ])
94
94
y = x .copy ()
95
- self .assertEqual (x . __str__ (), y . __str__ ( ))
95
+ self .assertEqual (str ( x ), str ( y ))
96
96
def test_changeComponent (self ):
97
97
"""
98
98
test for the changeComponent(...)-method
99
99
"""
100
100
x = Vector ([1 ,0 ,0 ])
101
101
x .changeComponent (0 ,0 )
102
102
x .changeComponent (1 ,1 )
103
- self .assertEqual (x . __str__ ( ),"(0,1,0)" )
103
+ self .assertEqual (str ( x ),"(0,1,0)" )
104
104
def test_str_matrix (self ):
105
105
A = Matrix ([[1 ,2 ,3 ],[2 ,4 ,5 ],[6 ,7 ,8 ]],3 ,3 )
106
- self .assertEqual ("|1,2,3|\n |2,4,5|\n |6,7,8|\n " ,A . __str__ ( ))
106
+ self .assertEqual ("|1,2,3|\n |2,4,5|\n |6,7,8|\n " ,str ( A ))
107
107
def test__mul__matrix (self ):
108
108
A = Matrix ([[1 ,2 ,3 ],[4 ,5 ,6 ],[7 ,8 ,9 ]],3 ,3 )
109
109
x = Vector ([1 ,2 ,3 ])
110
- self .assertEqual ("(14,32,50)" ,(A * x ). __str__ ( ))
111
- self .assertEqual ("|2,4,6|\n |8,10,12|\n |14,16,18|\n " ,(A * 2 ). __str__ ( ))
110
+ self .assertEqual ("(14,32,50)" ,str (A * x ))
111
+ self .assertEqual ("|2,4,6|\n |8,10,12|\n |14,16,18|\n " ,str (A * 2 ))
112
112
def test_changeComponent_matrix (self ):
113
113
A = Matrix ([[1 ,2 ,3 ],[2 ,4 ,5 ],[6 ,7 ,8 ]],3 ,3 )
114
114
A .changeComponent (0 ,2 ,5 )
115
- self .assertEqual ("|1,2,5|\n |2,4,5|\n |6,7,8|\n " ,A . __str__ ( ))
115
+ self .assertEqual ("|1,2,5|\n |2,4,5|\n |6,7,8|\n " ,str ( A ))
116
116
def test_component_matrix (self ):
117
117
A = Matrix ([[1 ,2 ,3 ],[2 ,4 ,5 ],[6 ,7 ,8 ]],3 ,3 )
118
118
self .assertEqual (7 ,A .component (2 ,1 ),0.01 )
119
119
def test__add__matrix (self ):
120
120
A = Matrix ([[1 ,2 ,3 ],[2 ,4 ,5 ],[6 ,7 ,8 ]],3 ,3 )
121
121
B = Matrix ([[1 ,2 ,7 ],[2 ,4 ,5 ],[6 ,7 ,10 ]],3 ,3 )
122
- self .assertEqual ("|2,4,10|\n |4,8,10|\n |12,14,18|\n " ,(A + B ). __str__ ( ))
122
+ self .assertEqual ("|2,4,10|\n |4,8,10|\n |12,14,18|\n " ,str (A + B ))
123
123
def test__sub__matrix (self ):
124
124
A = Matrix ([[1 ,2 ,3 ],[2 ,4 ,5 ],[6 ,7 ,8 ]],3 ,3 )
125
125
B = Matrix ([[1 ,2 ,7 ],[2 ,4 ,5 ],[6 ,7 ,10 ]],3 ,3 )
126
- self .assertEqual ("|0,0,-4|\n |0,0,0|\n |0,0,-2|\n " ,(A - B ). __str__ ( ))
126
+ self .assertEqual ("|0,0,-4|\n |0,0,0|\n |0,0,-2|\n " ,str (A - B ))
127
127
def test_squareZeroMatrix (self ):
128
128
self .assertEqual ('|0,0,0,0,0|\n |0,0,0,0,0|\n |0,0,0,0,0|\n |0,0,0,0,0|'
129
- + '\n |0,0,0,0,0|\n ' ,squareZeroMatrix (5 ). __str__ ( ))
129
+ + '\n |0,0,0,0,0|\n ' ,str ( squareZeroMatrix (5 )))
130
130
131
131
132
132
if __name__ == "__main__" :
133
- unittest .main ()
133
+ unittest .main ()
0 commit comments