[yt-svn] commit/yt: 3 new changesets

[Bitbucket]

3 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/5aa2808a7cf9/
changeset:   5aa2808a7cf9
branch:      yt
user:        ngoldbaum
date:        2012-11-30 21:17:35
summary:     Only doing ProjectionValuesTests along active dimensions.  Throwing a more useful error when an answer can't be found in the answer dict.
affected #:  1 file

diff -r 59114fb09b62b7164bc34d54bcd0716c03380080 -r 5aa2808a7cf971e860997909fcaaf2b62df966a7 yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -278,7 +278,10 @@
         if self.reference_storage.reference_name is not None:
             dd = self.reference_storage.get(self.storage_name)
             if dd is None: raise YTNoOldAnswer(self.storage_name)
-            ov = dd[self.description]
+            try:
+                ov = dd[self.description]
+            except KeyError:
+                raise YTNoOldAnswer(self.description)
             self.compare(nv, ov)
         else:
             ov = None
@@ -404,12 +407,18 @@
             obj = self.create_obj(self.pf, self.obj_type)
         else:
             obj = None
+        if self.pf.dimensionality < 3:
+            active = np.where(self.pf.domain_dimensions != 1)[0]
+            if self.axis not in active:
+                return None
         proj = self.pf.h.proj(self.axis, self.field,
                               weight_field=self.weight_field,
                               data_source = obj)
         return proj.field_data
 
     def compare(self, new_result, old_result):
+        if new_result is None:
+            return
         assert(len(new_result) == len(old_result))
         for k in new_result:
             assert (k in old_result)



https://bitbucket.org/yt_analysis/yt/changeset/18feb7c37f90/
changeset:   18feb7c37f90
branch:      yt
user:        ngoldbaum
date:        2012-11-30 21:36:19
summary:     Streamling a bit.  Thanks Matt!
affected #:  1 file

diff -r 5aa2808a7cf971e860997909fcaaf2b62df966a7 -r 18feb7c37f901a092d311ed1402dcb986bccf56e yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -277,11 +277,9 @@
         nv = self.run()
         if self.reference_storage.reference_name is not None:
             dd = self.reference_storage.get(self.storage_name)
-            if dd is None: raise YTNoOldAnswer(self.storage_name)
-            try:
-                ov = dd[self.description]
-            except KeyError:
-                raise YTNoOldAnswer(self.description)
+            if dd is None or self.description not in dd: 
+                raise YTNoOldAnswer("%s : %s" % (self.storage_name , self.description))
+            ov = dd[self.description]
             self.compare(nv, ov)
         else:
             ov = None
@@ -407,10 +405,7 @@
             obj = self.create_obj(self.pf, self.obj_type)
         else:
             obj = None
-        if self.pf.dimensionality < 3:
-            active = np.where(self.pf.domain_dimensions != 1)[0]
-            if self.axis not in active:
-                return None
+        if self.pf.domain_dimensions[self.axis] == 1: return None
         proj = self.pf.h.proj(self.axis, self.field,
                               weight_field=self.weight_field,
                               data_source = obj)



https://bitbucket.org/yt_analysis/yt/changeset/4f88d432d0da/
changeset:   4f88d432d0da
branch:      yt
user:        MatthewTurk
date:        2012-11-30 21:39:55
summary:     Merged in ngoldbaum/yt (pull request #359)
affected #:  1 file

diff -r ab6b8a938ca3193acf172fb1f6b999060522607b -r 4f88d432d0dab1c918a641316720bc58462fcc19 yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -277,7 +277,8 @@
         nv = self.run()
         if self.reference_storage.reference_name is not None:
             dd = self.reference_storage.get(self.storage_name)
-            if dd is None: raise YTNoOldAnswer(self.storage_name)
+            if dd is None or self.description not in dd: 
+                raise YTNoOldAnswer("%s : %s" % (self.storage_name , self.description))
             ov = dd[self.description]
             self.compare(nv, ov)
         else:
@@ -404,12 +405,15 @@
             obj = self.create_obj(self.pf, self.obj_type)
         else:
             obj = None
+        if self.pf.domain_dimensions[self.axis] == 1: return None
         proj = self.pf.h.proj(self.axis, self.field,
                               weight_field=self.weight_field,
                               data_source = obj)
         return proj.field_data
 
     def compare(self, new_result, old_result):
+        if new_result is None:
+            return
         assert(len(new_result) == len(old_result))
         for k in new_result:
             assert (k in old_result)

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.