Changeset 9554

Timestamp:

Jan 30, 2015, 9:59:22 AM (10 years ago)

Author:

steve

Message:

Fixed error in test_interpolate on win32

Location:

trunk/anuga_core/source/anuga/fit_interpolate

Files:

• interpolate.py (modified) (1 diff)
• test/test_interpolate.py (modified) (1 diff)

trunk/anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -131 +131 @@
 
     if use_cache is True:
-        if sys.platform != 'win32':
-            I = cache(Interpolate, args, kwargs, verbose=verbose)
-        else:
-            # Messy wrapping of Interpolate to deal with win32 error
-            def wrap_Interpolate(args,kwargs):
-                I = apply(Interpolate, args, kwargs)
-                return I
-            I = cache(wrap_Interpolate, (args, kwargs), {}, verbose=verbose)
+                I = cache(Interpolate, args, kwargs, verbose=verbose)
     else:
         I = apply(Interpolate, args, kwargs)    

trunk/anuga_core/source/anuga/fit_interpolate/test/test_interpolate.py

@@ -9 +9 @@
 import os
 import unittest
-from math import sqrt
 import tempfile
 import csv
+import time
 
 import numpy as num
-
+from math import sqrt
 
 # ANUGA code imports
 import anuga
-from anuga.fit_interpolate.interpolate import *
+from anuga.fit_interpolate.interpolate import Interpolate
+from anuga.fit_interpolate.interpolate import Interpolation_function
+from anuga.fit_interpolate.interpolate import interpolate
+from anuga.fit_interpolate.interpolate import interpolate_sww2csv
+
 from anuga.coordinate_transforms.geo_reference import Geo_reference
 from anuga.utilities.numerical_tools import mean, NAN