Changeset 7830:3d3fa7c5bb39

Timestamp:

12/21/07 14:28:10 (5 years ago)

Author:

Robert Miller <rlmillster@…>

Branch:

default

Parents:

7825:2c4862993e0e (diff), 7829:39f62d653a62 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

local merge

Files:

• sage/modules/free_module_element.pyx (modified) (1 diff)
• sage/modules/free_module_element.pyx (modified) (11 diffs)

sage/modules/free_module_element.pyx

@@ -266 +266 @@
 
     def _vector_(self, R):
+        r"""Return self as a vector.
+
+        EXAMPLES:
+            sage: v = vector(ZZ, [2, 12, 22])
+            sage: vector(v)
+            (2, 12, 22)
+            sage: vector(GF(7), v)
+            (2, 5, 1)
+            sage: vector(v, ZZ['x', 'y'])
+            (2, 12, 22)
+        """
         return self.change_ring(R)
+
+    def _matrix_(self, R=None):
+        r"""Return self as a row matrix.
+
+        EXAMPLES:
+            sage: v = vector(ZZ, [2, 12, 22])
+            sage: vector(v)
+            (2, 12, 22)
+            sage: vector(GF(7), v)
+            (2, 5, 1)
+            sage: vector(v, ZZ['x', 'y'])
+            (2, 12, 22)
+        """
+        if R is None:
+            R = self.base_ring()
+        from sage.matrix.constructor import matrix
+        return matrix(R, [list(self)])
+
+    def transpose(self):
+        r"""Return self as a column matrix.
+
+        EXAMPLES:
+            sage: v = vector(ZZ, [2, 12, 22])
+            sage: transpose(vector(v))
+            [ 2]
+            [12]
+            [22]
+
+            sage: transpose(vector(GF(7), v))
+            [2]
+            [5]
+            [1]
+
+            sage: transpose(vector(v, ZZ['x', 'y']))
+            [ 2]
+            [12]
+            [22]
+        """
+        return self._matrix_().transpose()
 
     def _hash(self):

sage/modules/free_module_element.pyx

@@ -321 +321 @@
         return hash(tuple(list(self)))
 
+    def copy(self):
+        """
+        Make a copy of this vector.
+        
+        EXAMPLES:
+            sage: v = vector([1..5]); v
+            (1, 2, 3, 4, 5)
+            sage: w = v.copy()
+            sage: v == w
+            True
+            sage: v is w
+            False
+            
+            sage: v = vector([1..5], sparse=True); v
+            (1, 2, 3, 4, 5)
+            sage: v.copy()
+            (1, 2, 3, 4, 5)
+        """
+        return self.__copy__()
+
+    def __copy__(self):
+        if self.is_sparse():
+            return self.parent()(self.dict())
+        else:
+            return self.parent()(self.list())
+
+    def set_immutable(self):
+        """
+        Make this vector immutable.  This operation can't be undone.
+        
+        EXAMPLES:
+            sage: v = vector([1..5]); v
+            (1, 2, 3, 4, 5)
+            sage: v[1] = 10
+            sage: v.set_immutable()
+            sage: v[1] = 10
+            Traceback (most recent call last):
+            ...
+            ValueError: vector is immutable; please change a copy instead (use self.copy())
+        """
+        self._is_mutable = 0
+
+    def is_mutable(self):
+        """
+        Return True if this vector is mutable, i.e., the entries can be changed.
+
+        EXAMPLES:
+            sage: v = vector(QQ['x,y'], [1..5]); v.is_mutable()
+            True
+            sage: v.set_immutable()
+            sage: v.is_mutable()
+            False
+        """
+        return self._is_mutable
+
+    def is_immutable(self):
+        """
+        Return True if this vector is immutable, i.e., the entries cannot be changed.
+
+        EXAMPLES:
+            sage: v = vector(QQ['x,y'], [1..5]); v.is_immutable()
+            False
+            sage: v.set_immutable()
+            sage: v.is_immutable()
+            True
+        """
+        return not self._is_mutable
+
     def change_ring(self, R):
+        """
+        Change the base ring of this vector, by coercing each element
+        of this vector into R.
+
+        EXAMPLES:
+            sage: v = vector(QQ['x,y'], [1..5]); v.change_ring(GF(3))
+            (1, 2, 0, 1, 2)
+        """
         P = self.parent()
         if P.base_ring() is R:
@@ -357 +433 @@
 
     def __abs__(self):
-        return self.norm()
+        """
+        Return the square root of the sum of the squares of the entries of this vector.
+
+        EXAMPLES:
+            sage: v = vector([1..5]); abs(v)
+            sqrt(15)
+            sage: v = vector(RDF, [1..5]); abs(v)
+            3.87298334621
+        """
+        return sum(self.list()).sqrt()
     
     cdef int _cmp_c_impl(left, Element right) except -2:
@@ -460 +545 @@
         
     def _repr_(self):
+        """
+        String representation of a vector.
+        
+        EXAMPLES:
+            sage: vector(QQ, [])._repr_()
+            '()'
+            sage: vector(QQ, range(5))._repr_()
+            '(0, 1, 2, 3, 4)'
+
+        Symbolic are not displayed using ASCII art. 
+            sage: x = var('x')
+            sage: v = vector([x/(2*x)+sqrt(2)+var('theta')^3,x/(2*x)]); v
+            (theta^3 + sqrt(2) + 1/2, 1/2)
+            sage: v._repr_()
+            '(theta^3 + sqrt(2) + 1/2, 1/2)'
+        """
         d = self.degree()
         if d == 0: return "()"
         # compute column widths
-        S = [str(x) for x in self.list(copy=False)]
+        S = [repr(x) for x in self.list(copy=False)]
         #width = max([len(x) for x in S])
         s = "("
@@ -507 +608 @@
             (1.0, 2.0, 3.0 + 4.0*I)
             sage: v[1:] = (1,3); v
-            (1.0, 1.0, 3.0)        
-        """
+            (1.0, 1.0, 3.0)
+
+            sage: v.set_immutable()
+            sage: v[1:2] = [3,5]
+            Traceback (most recent call last):
+            ...
+            ValueError: vector is immutable; please change a copy instead (use self.copy())
+        """
+        if not self._is_mutable:
+            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
         cdef Py_ssize_t k, d, n
         d = self.degree()
@@ -931 +1040 @@
         cdef FreeModuleElement_generic_dense x
         x = PY_NEW(FreeModuleElement_generic_dense)
+        x._is_mutable = 1
         x._parent = self._parent
         x._entries = v
@@ -959 +1069 @@
             
             if len(entries) != self.degree():
-                raise ArithmeticError, "entries must be a list of length %s"%\
+                raise TypeError, "entries must be a list of length %s"%\
                             self.degree()
             if coerce:
@@ -1079 +1189 @@
         Set entry i of self to value.
         """
+        if not self._is_mutable:
+            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
         i = int(i)
         #if not isinstance(i, int):
@@ -1102 +1214 @@
             (5, 3)
         """
+        if not self._is_mutable:
+            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
         cdef Py_ssize_t k, n, d
         d = self.degree()
@@ -1175 +1289 @@
         cdef FreeModuleElement_generic_sparse x
         x = PY_NEW(FreeModuleElement_generic_sparse)
+        x._is_mutable = 1
         x._parent = self._parent
         x._entries = v
@@ -1336 +1451 @@
         Like __setitem__ but with no type or bounds checking.
         """
+        if not self._is_mutable:
+            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
         i = int(i)
         if x == 0:
@@ -1346 +1463 @@
         """
         """
+        if not self._is_mutable:
+            raise ValueError, "vector is immutable; please change a copy instead (use self.copy())"
         i = int(i)
         #if not isinstance(i, int):