Changeset 4277

Timestamp:

Feb 23, 2007, 3:23:02 PM (18 years ago)

Author:

nick

Message:

update caching to work with non-contiguous array by changing .flat to ravel()

File:

• anuga_core/source/anuga/caching/caching.py (modified) (3 diffs)

anuga_core/source/anuga/caching/caching.py

@@ -332 +332 @@
     else:  # Evaluate function and save to cache
       if verbose:
+        
         msg1(funcname, args, kwargs,reason)
 
@@ -741 +742 @@
                             # comp_level = 1 works well.
 textwidth1 = 16             # Text width of key fields in report forms.
-textwidth2 = 132            # Maximal width of textual representation of
+#textwidth2 = 132            # Maximal width of textual representation of
+textwidth2 = 300            # Maximal width of textual representation of
                             # arguments.
 textwidth3 = 16             # Initial width of separation lines. Is modified.
@@ -2303 +2305 @@
       import Numeric
       if type(args) == Numeric.ArrayType:
-        if len(args.flat) > textwidth:
+#        if len(args.flat) > textwidth:  
+#        Changed by Duncan and Nick 21/2/07 .flat has problems with 
+#        non-contigous arrays and ravel is equal to .flat except it 
+#        can work with non-contigous arrays
+        if len(Numeric.ravel(args)) > textwidth:
           args = 'Array: ' + str(args.shape)