more

Author: gagolews

.devel/pytest/test_paths.py

@@ -7,7 +7,9 @@
 # more tests in sphinx/weave!
 
 def test_paths():
-    path = "~/Projects/clustering-data-v1/"
+    path = "~/Projects/clustering-data-v1"
+    path = os.path.expanduser(path)
+
     if os.path.exists(path):
         assert "wut" in clustbench.get_battery_names(path)
         assert "x1" in clustbench.get_dataset_names("wut", path)
@@ -16,12 +18,14 @@ def test_paths():
         assert "wut" in clustbench.get_battery_names()
         assert "x1" in clustbench.get_dataset_names("wut")
 
-        assert "wut" in clustbench.get_battery_names("../clustering-data-v1/")
-        assert "x1" in clustbench.get_dataset_names("wut", "../clustering-data-v1/")
+        assert "wut" in clustbench.get_battery_names(path)
+        assert "x1" in clustbench.get_dataset_names("wut", path)
+
+        assert clustbench.load_dataset("wut", "x2").data.flags["C_CONTIGUOUS"]
 
-        assert len(clustbench.load_dataset("wut", "x2", "../clustering-data-v1/")["labels"]) == 2
+        assert len(clustbench.load_dataset("wut", "x2").labels) == 2
 
-        assert len(clustbench.assertload_dataset("wut", "x2", url="https://github.com/gagolews/clustering-data-v1/raw/v1.1.0")["labels"]) == 2
+        assert len(clustbench.load_dataset("wut", "x2", url="https://github.com/gagolews/clustering-data-v1/raw/v1.1.0").labels) == 2
 
 
 if __name__ == "__main__":

clustbench/load_dataset.py

@@ -127,14 +127,15 @@ def load_dataset(
 
     data_file = base_name + ".data.gz"
     data = np.loadtxt(data_file, ndmin=2)
-    data = np.ascontiguousarray(data)
 
     if data.ndim != 2:
         raise ValueError("Not a matrix.")
 
     if preprocess:
         data = preprocess_data(data, random_state=random_state)
 
+    data = np.ascontiguousarray(data)
+
     labels = []
     i = 0
     while True: