[Yt-svn] yt-commit r1587 - branches/yt-1.6/tests trunk/tests

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Fri Jan 22 11:26:26 2010
New Revision: 1587
URL: http://yt.enzotools.org/changeset/1587

Log:
Updating unit tests to be consistent with the new contour finder.



Modified:
   branches/yt-1.6/tests/test_lagos.py
   trunk/tests/test_lagos.py

Modified: branches/yt-1.6/tests/test_lagos.py
==============================================================================
--- branches/yt-1.6/tests/test_lagos.py	(original)
+++ branches/yt-1.6/tests/test_lagos.py	Fri Jan 22 11:26:26 2010
@@ -512,6 +512,38 @@
         self.assertEqual(joined_region["CellMassMsun"].sum(),
                          self.region["CellMassMsun"].sum())
 
+    # I have verified that the *old* version of the code overconnected
+    # contours outside.  This are overridden to make sure this does not
+    # happen again!
+    def testContoursObtain(self):
+        cid = yt.lagos.identify_contours(self.data, "Density",
+                self.data["Density"].min()*2.00, self.data["Density"].max()*1.01)
+        self.assertEqual(len(cid), 10)
+
+    def testContoursCache(self):
+        cid = yt.lagos.identify_contours(self.data, "Density",
+                self.data["Density"].min()*2.00,
+                self.data["Density"].max()*1.01)
+        self.assertEqual(len(cid), 10)
+
+    def testExtractConnectedSetsNoCache(self):
+        mi = self.data["Density"].min() * 2.0
+        ma = self.data["Density"].max() * 0.99
+        cons, contours = self.data.extract_connected_sets(
+            "Density", 2, mi, ma)
+        self.assertEqual(len(contours), 2) # number of contour levels
+        self.assertEqual(len(contours[0]), 10)
+        self.assertEqual(len(contours[1]), 1)
+
+    def testExtractConnectedSetsCache(self):
+        mi = self.data["Density"].min() * 2.0
+        ma = self.data["Density"].max() * 0.99
+        cons, contours = self.data.extract_connected_sets(
+            "Density", 2, mi, ma, cache=True)
+        self.assertEqual(len(contours), 2) # number of contour levels
+        self.assertEqual(len(contours[0]), 10)
+        self.assertEqual(len(contours[1]), 1)
+
 class TestExtractFromRegion(TestRegionDataType):
     def setUp(self):
         TestRegionDataType.setUp(self)
@@ -534,6 +566,38 @@
         self.assertEqual(joined_region["CellMassMsun"].sum(),
                          self.region["CellMassMsun"].sum())
 
+    # I have verified that the *old* version of the code overconnected
+    # contours outside.  This are overridden to make sure this does not
+    # happen again!
+    def testContoursObtain(self):
+        cid = yt.lagos.identify_contours(self.data, "Density",
+                self.data["Density"].min()*2.00, self.data["Density"].max()*1.01)
+        self.assertEqual(len(cid), 10)
+
+    def testContoursCache(self):
+        cid = yt.lagos.identify_contours(self.data, "Density",
+                self.data["Density"].min()*2.00,
+                self.data["Density"].max()*1.01)
+        self.assertEqual(len(cid), 10)
+
+    def testExtractConnectedSetsNoCache(self):
+        mi = self.data["Density"].min() * 2.0
+        ma = self.data["Density"].max() * 0.99
+        cons, contours = self.data.extract_connected_sets(
+            "Density", 2, mi, ma)
+        self.assertEqual(len(contours), 2) # number of contour levels
+        self.assertEqual(len(contours[0]), 10)
+        self.assertEqual(len(contours[1]), 1)
+
+    def testExtractConnectedSetsCache(self):
+        mi = self.data["Density"].min() * 2.0
+        ma = self.data["Density"].max() * 0.99
+        cons, contours = self.data.extract_connected_sets(
+            "Density", 2, mi, ma, cache=True)
+        self.assertEqual(len(contours), 2) # number of contour levels
+        self.assertEqual(len(contours[0]), 10)
+        self.assertEqual(len(contours[1]), 1)
+
 
 class TestUnilinearInterpolator(unittest.TestCase):
     def setUp(self):

Modified: trunk/tests/test_lagos.py
==============================================================================
--- trunk/tests/test_lagos.py	(original)
+++ trunk/tests/test_lagos.py	Fri Jan 22 11:26:26 2010
@@ -512,6 +512,38 @@
         self.assertEqual(joined_region["CellMassMsun"].sum(),
                          self.region["CellMassMsun"].sum())
 
+    # I have verified that the *old* version of the code overconnected
+    # contours outside.  This are overridden to make sure this does not
+    # happen again!
+    def testContoursObtain(self):
+        cid = yt.lagos.identify_contours(self.data, "Density",
+                self.data["Density"].min()*2.00, self.data["Density"].max()*1.01)
+        self.assertEqual(len(cid), 10)
+
+    def testContoursCache(self):
+        cid = yt.lagos.identify_contours(self.data, "Density",
+                self.data["Density"].min()*2.00,
+                self.data["Density"].max()*1.01)
+        self.assertEqual(len(cid), 10)
+
+    def testExtractConnectedSetsNoCache(self):
+        mi = self.data["Density"].min() * 2.0
+        ma = self.data["Density"].max() * 0.99
+        cons, contours = self.data.extract_connected_sets(
+            "Density", 2, mi, ma)
+        self.assertEqual(len(contours), 2) # number of contour levels
+        self.assertEqual(len(contours[0]), 10)
+        self.assertEqual(len(contours[1]), 1)
+
+    def testExtractConnectedSetsCache(self):
+        mi = self.data["Density"].min() * 2.0
+        ma = self.data["Density"].max() * 0.99
+        cons, contours = self.data.extract_connected_sets(
+            "Density", 2, mi, ma, cache=True)
+        self.assertEqual(len(contours), 2) # number of contour levels
+        self.assertEqual(len(contours[0]), 10)
+        self.assertEqual(len(contours[1]), 1)
+
 class TestExtractFromRegion(TestRegionDataType):
     def setUp(self):
         TestRegionDataType.setUp(self)
@@ -534,6 +566,38 @@
         self.assertEqual(joined_region["CellMassMsun"].sum(),
                          self.region["CellMassMsun"].sum())
 
+    # I have verified that the *old* version of the code overconnected
+    # contours outside.  This are overridden to make sure this does not
+    # happen again!
+    def testContoursObtain(self):
+        cid = yt.lagos.identify_contours(self.data, "Density",
+                self.data["Density"].min()*2.00, self.data["Density"].max()*1.01)
+        self.assertEqual(len(cid), 10)
+
+    def testContoursCache(self):
+        cid = yt.lagos.identify_contours(self.data, "Density",
+                self.data["Density"].min()*2.00,
+                self.data["Density"].max()*1.01)
+        self.assertEqual(len(cid), 10)
+
+    def testExtractConnectedSetsNoCache(self):
+        mi = self.data["Density"].min() * 2.0
+        ma = self.data["Density"].max() * 0.99
+        cons, contours = self.data.extract_connected_sets(
+            "Density", 2, mi, ma)
+        self.assertEqual(len(contours), 2) # number of contour levels
+        self.assertEqual(len(contours[0]), 10)
+        self.assertEqual(len(contours[1]), 1)
+
+    def testExtractConnectedSetsCache(self):
+        mi = self.data["Density"].min() * 2.0
+        ma = self.data["Density"].max() * 0.99
+        cons, contours = self.data.extract_connected_sets(
+            "Density", 2, mi, ma, cache=True)
+        self.assertEqual(len(contours), 2) # number of contour levels
+        self.assertEqual(len(contours[0]), 10)
+        self.assertEqual(len(contours[1]), 1)
+
 
 class TestUnilinearInterpolator(unittest.TestCase):
     def setUp(self):