eegdash 0.3.5.dev183002612__tar.gz → 0.3.6.dev182011805__tar.gz

{eegdash-0.3.5.dev183002612/eegdash.egg-info → eegdash-0.3.6.dev182011805}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eegdash
-Version: 0.3.5.dev183002612
+Version: 0.3.6.dev182011805
 Summary: EEG data for machine learning
 Author-email: Young Truong <dt.young112@gmail.com>, Arnaud Delorme <adelorme@gmail.com>, Aviv Dotan <avivd220@gmail.com>, Oren Shriki <oren70@gmail.com>, Bruno Aristimunha <b.aristimunha@gmail.com>
 License-Expression: GPL-3.0-only

{eegdash-0.3.5.dev183002612 → eegdash-0.3.6.dev182011805}/eegdash/__init__.py

@@ -7,4 +7,4 @@ __init__mongo_client()
 
 __all__ = ["EEGDash", "EEGDashDataset", "EEGChallengeDataset"]
 
-__version__ = "0.3.5.dev183002612"
+__version__ = "0.3.6.dev182011805"

{eegdash-0.3.5.dev183002612 → eegdash-0.3.6.dev182011805}/eegdash/api.py

@@ -90,12 +90,16 @@ class EEGDash:
     ) -> list[Mapping[str, Any]]:
         """Find records in the MongoDB collection.
 
-        This method can be called in two ways:
+        This method supports four usage patterns:
         1. With a pre-built MongoDB query dictionary (positional argument):
            >>> eegdash.find({"dataset": "ds002718", "subject": {"$in": ["012", "013"]}})
         2. With user-friendly keyword arguments for simple and multi-value queries:
            >>> eegdash.find(dataset="ds002718", subject="012")
            >>> eegdash.find(dataset="ds002718", subject=["012", "013"])
+        3. With an explicit empty query to return all documents:
+           >>> eegdash.find({})  # fetches all records (use with care)
+        4. By combining a raw query with kwargs (merged via logical AND):
+           >>> eegdash.find({"dataset": "ds002718"}, subject=["012", "013"])  # yields {"$and":[{"dataset":"ds002718"}, {"subject":{"$in":["012","013"]}}]}
 
         Parameters
         ----------
@@ -110,26 +114,34 @@ class EEGDash:
         list:
             A list of DB records (string-keyed dictionaries) that match the query.
 
-        Raises
-        ------
-        ValueError
-            If both a `query` dictionary and keyword arguments are provided.
-
         """
-        if query is not None and kwargs:
-            raise ValueError(
-                "Provide either a positional 'query' dictionary or keyword arguments, not both."
-            )
-
-        final_query = {}
-        if query is not None:
-            final_query = query
-        elif kwargs:
-            final_query = self._build_query_from_kwargs(**kwargs)
+        final_query: dict[str, Any] | None = None
+
+        # Accept explicit empty dict {} to mean "match all"
+        raw_query = query if isinstance(query, dict) else None
+        kwargs_query = self._build_query_from_kwargs(**kwargs) if kwargs else None
+
+        # Determine presence, treating {} as a valid raw query
+        has_raw = isinstance(raw_query, dict)
+        has_kwargs = kwargs_query is not None
+
+        if has_raw and has_kwargs:
+            # Detect conflicting constraints on the same field (e.g., task specified
+            # differently in both places) and raise a clear error instead of silently
+            # producing an empty result.
+            self._raise_if_conflicting_constraints(raw_query, kwargs_query)
+            # Merge with logical AND so both constraints apply
+            if raw_query:  # non-empty dict adds constraints
+                final_query = {"$and": [raw_query, kwargs_query]}
+            else:  # {} adds nothing; use kwargs_query only
+                final_query = kwargs_query
+        elif has_raw:
+            # May be {} meaning match-all, or a non-empty dict
+            final_query = raw_query
+        elif has_kwargs:
+            final_query = kwargs_query
         else:
-            # By default, an empty query {} returns all documents.
-            # This can be dangerous, so we can either allow it or raise an error.
-            # Let's require an explicit query for safety.
+            # Avoid accidental full scans
             raise ValueError(
                 "find() requires a query dictionary or at least one keyword argument. "
                 "To find all documents, use find({})."
@@ -224,9 +236,12 @@ class EEGDash:
         return record
 
     def _build_query_from_kwargs(self, **kwargs) -> dict[str, Any]:
-        """Builds and validates a MongoDB query from user-friendly keyword arguments.
+        """Build and validate a MongoDB query from user-friendly keyword arguments.
 
-        Translates list values into MongoDB's `$in` operator.
+        Improvements:
+        - Reject None values and empty/whitespace-only strings
+        - For list/tuple/set values: strip strings, drop None/empties, deduplicate, and use `$in`
+        - Preserve scalars as exact matches
         """
         # 1. Validate that all provided keys are allowed for querying
         unknown_fields = set(kwargs.keys()) - self._ALLOWED_QUERY_FIELDS
@@ -239,19 +254,108 @@ class EEGDash:
         # 2. Construct the query dictionary
         query = {}
         for key, value in kwargs.items():
-            if isinstance(value, (list, tuple)):
-                if not value:
+            # None is not a valid constraint
+            if value is None:
+                raise ValueError(
+                    f"Received None for query parameter '{key}'. Provide a concrete value."
+                )
+
+            # Handle list-like values as multi-constraints
+            if isinstance(value, (list, tuple, set)):
+                cleaned: list[Any] = []
+                for item in value:
+                    if item is None:
+                        continue
+                    if isinstance(item, str):
+                        item = item.strip()
+                        if not item:
+                            continue
+                    cleaned.append(item)
+                # Deduplicate while preserving order
+                cleaned = list(dict.fromkeys(cleaned))
+                if not cleaned:
                     raise ValueError(
                         f"Received an empty list for query parameter '{key}'. This is not supported."
                     )
-                # If the value is a list, use the `$in` operator for multi-search
-                query[key] = {"$in": value}
+                query[key] = {"$in": cleaned}
             else:
-                # Otherwise, it's a direct match
+                # Scalars: trim strings and validate
+                if isinstance(value, str):
+                    value = value.strip()
+                    if not value:
+                        raise ValueError(
+                            f"Received an empty string for query parameter '{key}'."
+                        )
                 query[key] = value
 
         return query
 
+    # --- Query merging and conflict detection helpers ---
+    def _extract_simple_constraint(self, query: dict[str, Any], key: str):
+        """Extract a simple constraint for a given key from a query dict.
+
+        Supports only top-level equality (key: value) and $in (key: {"$in": [...]})
+        constraints. Returns a tuple (kind, value) where kind is "eq" or "in". If the
+        key is not present or uses other operators, returns None.
+        """
+        if not isinstance(query, dict) or key not in query:
+            return None
+        val = query[key]
+        if isinstance(val, dict):
+            if "$in" in val and isinstance(val["$in"], (list, tuple)):
+                return ("in", list(val["$in"]))
+            return None  # unsupported operator shape for conflict checking
+        else:
+            return ("eq", val)
+
+    def _raise_if_conflicting_constraints(
+        self, raw_query: dict[str, Any], kwargs_query: dict[str, Any]
+    ) -> None:
+        """Raise ValueError if both query sources define incompatible constraints.
+
+        We conservatively check only top-level fields with simple equality or $in
+        constraints. If a field appears in both queries and constraints are mutually
+        exclusive, raise an explicit error to avoid silent empty result sets.
+        """
+        if not raw_query or not kwargs_query:
+            return
+
+        # Only consider fields we generally allow; skip meta operators like $and
+        raw_keys = set(raw_query.keys()) & self._ALLOWED_QUERY_FIELDS
+        kw_keys = set(kwargs_query.keys()) & self._ALLOWED_QUERY_FIELDS
+        dup_keys = raw_keys & kw_keys
+        for key in dup_keys:
+            rc = self._extract_simple_constraint(raw_query, key)
+            kc = self._extract_simple_constraint(kwargs_query, key)
+            if rc is None or kc is None:
+                # If either side is non-simple, skip conflict detection for this key
+                continue
+
+            r_kind, r_val = rc
+            k_kind, k_val = kc
+
+            # Normalize to sets when appropriate for simpler checks
+            if r_kind == "eq" and k_kind == "eq":
+                if r_val != k_val:
+                    raise ValueError(
+                        f"Conflicting constraints for '{key}': query={r_val!r} vs kwargs={k_val!r}"
+                    )
+            elif r_kind == "in" and k_kind == "eq":
+                if k_val not in r_val:
+                    raise ValueError(
+                        f"Conflicting constraints for '{key}': query in {r_val!r} vs kwargs={k_val!r}"
+                    )
+            elif r_kind == "eq" and k_kind == "in":
+                if r_val not in k_val:
+                    raise ValueError(
+                        f"Conflicting constraints for '{key}': query={r_val!r} vs kwargs in {k_val!r}"
+                    )
+            elif r_kind == "in" and k_kind == "in":
+                if len(set(r_val).intersection(k_val)) == 0:
+                    raise ValueError(
+                        f"Conflicting constraints for '{key}': disjoint sets {r_val!r} and {k_val!r}"
+                    )
+
     def load_eeg_data_from_s3(self, s3path: str) -> xr.DataArray:
         """Load an EEGLAB .set file from an AWS S3 URI and return it as an xarray DataArray.
 
@@ -676,10 +780,8 @@ class EEGDashDataset(BaseConcatDataset):
             # If list is provided, let _build_query_from_kwargs turn it into $in later.
             query_kwargs.setdefault("dataset", dataset)
 
-        if query and query_kwargs:
-            raise ValueError(
-                "Provide either a 'query' dictionary or keyword arguments for filtering, not both."
-            )
+        # Allow mixing raw DB query with additional keyword filters. Both will be
+        # merged by EEGDash.find() (logical AND), so we do not raise here.
 
         try:
             if records is not None:
@@ -723,7 +825,7 @@ class EEGDashDataset(BaseConcatDataset):
                                 **base_dataset_kwargs,
                             )
                         )
-            elif query or query_kwargs:
+            elif query is not None or query_kwargs:
                 # This is the DB query path that we are improving
                 datasets = self.find_datasets(
                     query=query,
@@ -786,6 +888,10 @@ class EEGDashDataset(BaseConcatDataset):
         """
         datasets: list[EEGDashBaseDataset] = []
 
+        # Build records using either a raw query OR keyword filters, but not both.
+        # Note: callers may accidentally pass an empty dict for `query` along with
+        # kwargs. In that case, treat it as if no query was provided and rely on kwargs.
+        # Always delegate merging of raw query + kwargs to EEGDash.find
         self.records = self.eeg_dash.find(query, **query_kwargs)
 
         for record in self.records:

{eegdash-0.3.5.dev183002612 → eegdash-0.3.6.dev182011805}/eegdash/dataset.py

@@ -321,7 +321,9 @@ class EEGChallengeDataset(EEGDashDataset):
             )
 
         if self.mini:
-            if query and "subject" in query:
+            # Disallow mixing subject selection with mini=True since mini already
+            # applies a predefined subject subset.
+            if (query and "subject" in query) or ("subject" in kwargs):
                 raise ValueError(
                     "Query using the parameters `subject` with the class EEGChallengeDataset and `mini==True` is not possible."
                     "Please don't use the `subject` selection twice."

eegdash-0.3.6.dev182011805/eegdash/dataset_summary.csv

@@ -0,0 +1,256 @@
+dataset,n_records,n_subjects,n_tasks,nchans_set,sampling_freqs,duration_hours_total,size,size_bytes,s3_item_count
+ds002718,18,18,1,74,250,14.844,4.31 GB,4624315408,0
+ds005505,1342,136,10,129,500,125.366,103.11 GB,110708824369,0
+ds004745,6,6,1,,1000,0.0,242.08 MB,253839725,0
+ds005514,2885,295,10,129,500,213.008,185.03 GB,198677728665,0
+ds005512,2320,257,10,129,500,196.205,157.19 GB,168778507427,0
+ds005510,1227,135,10,129,500,112.464,90.80 GB,97492961757,0
+ds005511,3100,381,10,"6,129",500,285.629,244.83 GB,262883881898,0
+ds005509,3326,330,10,129,500,274.559,224.17 GB,240701124393,0
+ds005508,3342,324,10,129,500,269.281,229.81 GB,246753736933,0
+ds005507,1812,184,10,129,500,168.649,139.37 GB,149646718160,0
+ds005506,1405,150,10,129,500,127.896,111.88 GB,120126449650,0
+test,2,1,1,64,500,20.556,0 B,0,0
+ds004854,1,1,1,64,128,0.535,79.21 MB,83057080,0
+ds004853,1,1,1,64,128,0.535,79.21 MB,83057080,0
+ds004844,68,17,1,64,1024,21.252,22.33 GB,23976121966,0
+ds004843,92,14,1,64,256,29.834,7.66 GB,8229205795,0
+ds004842,102,14,1,64,256,20.102,5.21 GB,5589054270,0
+ds004852,1,1,1,64,128,0.535,79.21 MB,83057106,0
+ds004851,1,1,1,64,128,0.535,56.59 GB,60765064414,0
+ds004850,1,1,1,64,128,0.535,79.21 MB,83057078,0
+ds004855,1,1,1,64,128,0.535,79.21 MB,83057076,0
+ds004849,1,1,1,64,128,0.535,79.21 MB,83057084,0
+ds004841,147,20,1,64,256,29.054,7.31 GB,7846934401,0
+ds004661,17,17,1,64,128,10.137,1.40 GB,1505577392,0
+ds004660,42,21,1,32,"2048,512",23.962,7.25 GB,7782408710,0
+ds004657,119,24,1,64,"1024,8192",27.205,43.06 GB,46237302701,0
+ds004362,1526,109,1,64,"128,160",48.592,11.14 GB,11961862159,0
+ds004010,24,24,1,64,1000,26.457,23.14 GB,24844863976,0
+ds002181,226,226,1,125,500,7.676,150.89 MB,158222084,0
+ds004554,16,16,1,99,1000,0.024,8.79 GB,9432865762,0
+ds005697,50,50,1,"65,69",1000,77.689,66.58 GB,71486411402,0
+ds004350,240,24,5,64,256,41.265,26.83 GB,28810754598,0
+ds004785,17,17,1,32,500,0.019,351.17 MB,368224136,0
+ds004504,88,88,1,19,500,19.608,5.38 GB,5780997160,0
+ds004635,55,55,1,129,1000,20.068,30.56 GB,32817659781,0
+ds005787,448,19,1,"64,66","1000,500",23.733,27.09 GB,29087512003,0
+ds005079,60,1,15,65,500,3.25,1.68 GB,1809231997,0
+ds005342,32,32,1,17,250,33.017,2.03 GB,2181610593,0
+ds005034,100,25,2,129,1000,37.525,61.36 GB,65885315479,0
+ds002680,350,14,1,31,1000,21.244,9.22 GB,9902152149,0
+ds003805,1,1,1,19,500,0.033,16.96 MB,17781347,0
+ds003838,130,65,2,63,1000,136.757,253.29 GB,271965704312,0
+ds002691,20,20,1,32,250,6.721,776.76 MB,814491068,0
+ds003690,375,75,3,"64,66",500,46.771,21.46 GB,23043491552,0
+ds004040,4,2,1,64,512,4.229,11.59 GB,12440304224,0
+ds003061,39,13,1,79,256,8.196,2.26 GB,2421951821,0
+ds005672,3,3,1,"65,69",1000,4.585,4.23 GB,4545641306,0
+ds005410,81,81,1,63,1000,22.976,19.76 GB,21213481224,0
+ds003753,25,25,1,64,500,10.104,4.62 GB,4965253148,0
+ds005565,24,24,1,,500,11.436,2.62 GB,2816607296,0
+ds002893,52,49,1,33,"250,250.0293378038558",36.114,7.70 GB,8263047991,0
+ds002578,2,2,1,256,256,1.455,1.33 GB,1429254677,0
+ds005089,36,36,1,63,1000,68.82,68.01 GB,73021312961,0
+ds003822,25,25,1,64,500,12.877,5.82 GB,6248744522,0
+ds003670,62,25,1,32,2000,72.772,97.53 GB,104721234854,0
+ds005048,35,35,1,,250,5.203,355.91 MB,373200880,0
+ds004574,146,146,1,"63,64,66",500,31.043,13.48 GB,14470034208,0
+ds004519,40,40,1,62,250,0.067,12.56 GB,13486848019,0
+ds004602,546,182,3,128,"250,500",87.11,73.91 GB,79364456958,0
+ds004784,6,1,6,128,512,0.518,10.82 GB,11621460277,0
+ds004771,61,61,1,34,256,0.022,1.36 GB,1462195517,0
+ds003518,137,110,1,64,500,89.888,39.51 GB,42423490194,0
+ds005207,39,20,1,"6,10,12,14,15,16,17,18","128,250",422.881,69.12 GB,74214619739,0
+ds005866,60,60,1,,500,15.976,3.57 GB,3837211623,0
+ds003523,221,91,1,64,500,84.586,37.54 GB,40304852370,0
+ds004347,48,24,1,64,"128,512",6.389,2.69 GB,2890549319,0
+ds004588,42,42,1,24,300,4.957,601.76 MB,630994652,0
+ds005811,448,19,1,62,"1000,500",23.733,24.12 GB,25902600444,0
+ds003987,69,23,1,64,500.0930232558139,52.076,26.41 GB,28362707915,0
+ds004317,50,50,1,60,500,37.767,18.29 GB,19639199743,0
+ds004033,36,18,2,64,500,42.645,19.81 GB,21270391452,0
+ds004315,50,50,1,60,500,21.104,9.81 GB,10532856899,0
+ds003474,122,122,1,64,500,36.61,16.64 GB,17867805967,0
+ds003509,84,56,1,64,500,48.535,22.34 GB,23988721823,0
+ds005868,48,48,1,,500,13.094,2.93 GB,3146417813,0
+ds003516,25,25,1,47,500,22.57,13.46 GB,14451393616,0
+ds004942,62,62,1,65,1000,28.282,25.05 GB,26899933549,0
+ds004348,18,9,2,34,200,35.056,12.30 GB,13210476025,0
+ds004625,543,32,9,120,500,28.397,62.46 GB,67069111978,0
+ds003517,34,17,1,64,500,13.273,6.48 GB,6952992399,0
+ds004368,40,39,1,63,128,0.033,997.14 MB,1045574811,0
+ds004584,149,149,1,"63,64,66",500,6.641,2.87 GB,3078216874,0
+ds003506,84,56,1,64,500,35.381,16.21 GB,17400039992,0
+ds003570,40,40,1,64,2048,26.208,36.12 GB,38783075272,0
+ds003490,75,50,1,64,500,12.76,5.85 GB,6276775630,0
+ds004117,85,23,1,69,"1000,250,500,500.059",15.941,5.80 GB,6230776574,0
+ds004505,25,25,1,120,250,30.398,522.56 GB,561092363916,0
+ds004580,147,147,1,"63,64,66",500,36.514,15.84 GB,17008438640,0
+ds004532,137,110,1,64,500,49.651,22.09 GB,23719572304,0
+ds004902,218,71,2,61,"500,5000",18.118,8.29 GB,8898600609,0
+ds004295,26,26,1,66,"1024,512",34.313,31.51 GB,33831372141,0
+ds003519,54,27,1,64,500,20.504,8.96 GB,9623156762,0
+ds003458,23,23,1,64,500,10.447,4.72 GB,5065250805,0
+ds003004,34,34,1,"134,180,189,196,201,206,207,208,209,211,212,213,214,215,218,219,220,221,222,223,224,226,227,229,231,232,235",256,49.072,35.63 GB,38255333087,0
+ds004200,20,20,1,37,1000,14.123,7.21 GB,7740555648,0
+ds004015,36,36,1,18,500,47.29,6.03 GB,6475870225,0
+ds004595,53,53,1,64,500,17.078,7.89 GB,8470863296,0
+ds004626,52,52,1,68,1000,21.359,19.87 GB,21336341431,0
+ds004475,30,30,1,"113,115,118,119,120,122,123,124,125,126,127,128",512,26.899,112.74 GB,121053900746,0
+ds004515,54,54,1,64,500,20.61,9.48 GB,10177384081,0
+ds004883,516,172,3,128,500,137.855,122.80 GB,131858855599,0
+ds003739,120,30,4,128,256,20.574,10.94 GB,11742611182,0
+ds004389,260,26,4,42,10000,30.932,376.50 GB,404264486093,0
+ds004367,40,40,1,68,1200,24.81,27.98 GB,30039343808,0
+ds004369,41,41,1,4,500,37.333,8.01 GB,8596739356,0
+ds004579,139,139,1,"63,64,66",500,55.703,24.12 GB,25896737812,0
+ds005416,23,23,1,64,1000,24.68,21.30 GB,22869325264,0
+ds001785,54,18,3,63,"1000,1024",14.644,27.86 GB,29915397068,0
+ds001971,273,20,1,108,512,46.183,31.98 GB,34339201543,0
+ds004388,399,40,3,67,10000,43.327,682.54 GB,732876226489,0
+ds003478,243,122,1,64,500,23.57,10.65 GB,11430531312,0
+ds004306,15,12,1,124,1024,18.183,79.11 GB,84945921180,0
+ds005305,165,165,1,64,"2048,512",14.136,6.41 GB,6887595053,0
+ds005114,223,91,1,64,500,125.701,56.47 GB,60630838923,0
+ds003039,16,16,1,64,500,14.82,7.82 GB,8401240820,0
+ds003602,699,118,6,35,1000,159.35,73.21 GB,78609742568,0
+ds003655,156,156,1,19,500,130.923,20.26 GB,21756905870,0
+ds003522,200,96,1,64,500,57.079,25.36 GB,27225424004,0
+ds003801,20,20,1,24,250,13.689,1.15 GB,1233075452,0
+ds005296,62,62,1,,500,37.205,8.53 GB,9154623627,0
+ds004561,23,23,1,62,10000,11.379,97.96 GB,105188606283,0
+ds005131,63,58,2,64,500,52.035,22.35 GB,23996524256,0
+ds005028,66,11,3,,,0.0,1.46 GB,1563795662,0
+ds005170,225,5,1,,,0.0,261.77 GB,281068716313,0
+ds004840,51,9,3,8,"1024,256,512",11.306,1.75 GB,1876219715,0
+ds004718,51,51,1,64,1000,21.836,108.98 GB,117013849037,0
+ds002725,105,21,5,30,1000,0.0,15.32 GB,16447829856,0
+ds004408,380,19,1,128,512,20.026,18.70 GB,20083249915,0
+ds004796,235,79,3,,1000,0.0,240.21 GB,257923739221,0
+ds004511,134,45,3,139,3000,48.922,202.28 GB,217194709208,0
+ds004817,20,20,1,63,1000,0.0,25.34 GB,27207910489,0
+ds003190,280,19,1,0,256,29.891,1.27 GB,1361816737,0
+ds004917,24,24,1,,,0.0,36.47 GB,39162637090,0
+ds004357,16,16,1,63,1000,0.0,69.56 GB,74685825960,0
+ds005397,26,26,1,64,500,27.923,12.10 GB,12993735747,0
+ds003846,60,19,1,64,500,24.574,11.36 GB,12193814091,0
+ds004024,497,13,3,64,20000,55.503,1021.22 GB,1096522006089,0
+ds005815,137,26,4,30,"1000,500",38.618,9.91 GB,10642000219,0
+ds005429,61,15,3,64,"2500,5000",14.474,16.47 GB,17685373747,0
+ds003702,47,47,1,61,500,0.0,60.93 GB,65421860496,0
+ds004577,130,103,1,"19,21,24",200,22.974,652.76 MB,684471843,0
+ds003574,18,18,1,64,500,0.0,14.79 GB,15876358782,0
+ds005779,250,19,16,"64,67,70",5000,16.65,88.67 GB,95206991747,0
+ds005185,356,20,3,8,500,0.0,783.25 GB,841005525524,0
+ds001787,40,24,1,64,256,27.607,5.69 GB,6112379157,0
+ds003505,37,19,2,128,2048,0.0,90.13 GB,96777780296,0
+ds005340,15,15,1,2,10000,35.297,19.14 GB,20556600898,0
+ds005363,43,43,1,64,1000,43.085,17.71 GB,19011101429,0
+ds005121,39,34,1,58,512,41.498,9.04 GB,9711092185,0
+ds004256,53,53,2,64,500,42.337,18.18 GB,19516271706,0
+ds005420,72,37,2,20,500,5.485,372.11 MB,390189484,0
+ds002034,167,14,4,64,512,37.248,10.10 GB,10842685551,0
+ds003825,50,50,1,"63,128",1000,0.0,55.34 GB,59421076202,0
+ds004587,114,103,1,59,10000,25.491,219.34 GB,235517890780,0
+ds004598,20,9,1,,10000,0.0,26.66 GB,28629940214,0
+ds005383,240,30,1,30,200,8.327,17.43 GB,18712238212,0
+ds003195,20,10,2,19,200,4.654,121.08 MB,126957549,0
+ds005403,32,32,1,62,10000,13.383,135.65 GB,145656630881,0
+ds004621,167,42,4,,1000,0.0,77.39 GB,83096459121,0
+ds005863,357,127,4,27,500,0.0,10.59 GB,11371790189,0
+ds005594,16,16,1,64,1000,12.934,10.89 GB,11695589464,0
+ds002336,54,10,6,,5000,0.0,17.98 GB,19300632853,0
+ds004043,20,20,1,63,1000,0.0,30.44 GB,32685724275,0
+ds005106,42,42,1,32,500,0.012,12.62 GB,13547440607,0
+ds004284,18,18,1,129,1000,9.454,16.49 GB,17703523636,0
+ds005620,202,21,3,"64,65",5000,21.811,77.30 GB,83002663223,0
+ds002720,165,18,10,19,1000,0.0,2.39 GB,2566221024,0
+ds005307,73,7,1,"72,104",10000,1.335,18.59 GB,19956343711,0
+ds002094,43,20,3,30,5000,18.593,39.45 GB,42356287674,0
+ds002833,80,20,1,257,1000,11.604,39.77 GB,42698182133,0
+ds002218,18,18,1,0,256,16.52,1.95 GB,2089183870,0
+ds005021,36,36,1,64,1024,0.0,83.20 GB,89337424472,0
+ds004264,21,21,1,31,1000,0.0,3.30 GB,3546307489,0
+ds004446,237,30,1,129,1000,33.486,29.23 GB,31382984441,0
+ds004980,17,17,1,64,"499.9911824,499.9912809,499.991385,499.9914353,499.9914553,499.9915179,499.9917272,499.9917286,499.9917378,499.9919292,499.9919367,499.9923017,499.9923795,500",36.846,15.82 GB,16989514798,0
+ds002722,94,19,5,32,1000,0.0,6.10 GB,6545819602,0
+ds003944,82,82,1,61,"1000,3000.00030000003",6.999,6.15 GB,6606397067,0
+ds004279,60,56,1,64,1000,53.729,25.22 GB,27082275780,0
+ds005876,29,29,1,32,1000,16.017,7.61 GB,8170007441,0
+ds003816,1077,48,8,127,1000,159.313,53.97 GB,57953346429,0
+ds005385,3264,608,2,64,1000,169.62,74.07 GB,79529430923,0
+ds004572,516,52,10,58,1000,52.624,43.56 GB,46777273840,0
+ds005095,48,48,1,63,1000,16.901,14.28 GB,15336165645,0
+ds004460,40,20,1,160,1000,27.494,61.36 GB,65881325046,0
+ds005189,30,30,1,61,1000,0.0,17.03 GB,18283103870,0
+ds005274,22,22,1,6,500,0.0,71.91 MB,75400374,0
+ds004075,116,29,4,,1000,0.0,7.39 GB,7936060172,0
+ds004447,418,22,1,"128,129",1000,23.554,20.73 GB,22253514308,0
+ds004952,245,10,1,128,1000,123.411,696.72 GB,748095804444,0
+ds002724,96,10,4,32,1000,0.0,8.52 GB,9150248444,0
+ds005571,45,24,2,64,5000,0.0,62.77 GB,67394456730,0
+ds004262,21,21,1,31,1000,0.0,3.48 GB,3731654700,0
+ds005273,33,33,1,63,1000,58.055,44.42 GB,47690882240,0
+ds004520,33,33,1,62,250,0.055,10.41 GB,11175908145,0
+ds004444,465,30,1,129,1000,55.687,48.62 GB,52204973958,0
+ds004582,73,73,1,59,10000,34.244,294.22 GB,315915939478,0
+ds002723,44,8,6,32,1000,0.0,2.60 GB,2791985215,0
+ds003751,38,38,1,128,250,19.95,4.71 GB,5057922307,0
+ds003421,80,20,1,257,1000,11.604,76.77 GB,82433418198,0
+ds002158,117,20,1,,,0.0,428.59 GB,460190030981,0
+ds004951,23,11,1,63,1000,29.563,22.00 GB,23627352274,0
+ds004802,38,38,1,65,"2048,512",0.0,29.34 GB,31504070800,0
+ds004816,20,20,1,63,1000,0.0,23.31 GB,25028989553,0
+ds005873,2850,125,1,2,256,11935.09,117.21 GB,125851664268,0
+ds003194,29,15,2,"19,21",200,7.178,189.15 MB,198333904,0
+ds004356,24,22,1,34,10000,0.0,213.08 GB,228796286136,0
+ds004381,437,18,1,"4,5,7,8,10",20000,11.965,12.36 GB,13275540742,0
+ds004196,4,4,1,64,512,1.511,9.33 GB,10022898106,0
+ds005692,59,30,1,24,5000,112.206,92.81 GB,99649237201,0
+ds002338,85,17,4,,5000,0.0,25.89 GB,27802574037,0
+ds004022,21,7,1,"16,18",500,0.0,634.93 MB,665774359,0
+ds004603,37,37,1,64,1024,30.653,39.13 GB,42020115207,0
+ds004752,136,15,1,"0,8,10,19,20,21,23","200,2000,4000,4096",0.302,11.95 GB,12829882725,0
+ds003768,255,33,2,,,0.0,89.24 GB,95819107191,0
+ds003947,61,61,1,61,"1000,3000.00030000003",5.266,12.54 GB,13466591394,0
+ds005530,21,17,1,10,500,154.833,6.47 GB,6949642931,0
+ds005555,256,128,1,"2,8,9,11,12,13",256,2002.592,33.45 GB,35921410419,0
+ds004477,9,9,1,79,2048,13.557,22.34 GB,23990303639,0
+ds005688,89,20,5,4,"10000,20000",2.502,8.42 GB,9036021093,0
+ds003766,124,31,4,129,1000,39.973,152.77 GB,164033759919,0
+ds005540,103,59,1,64,"1200,600",0.0,70.40 GB,75594345013,0
+ds004152,21,21,1,31,1000,0.0,4.77 GB,5118976537,0
+ds003626,30,10,1,,,0.0,24.99 GB,26828585815,0
+ds002814,168,21,1,68,1200,0.0,48.57 GB,52151006842,0
+ds003645,108,18,1,,,0.0,105.89 GB,113698969765,0
+ds005586,23,23,1,60,1000,33.529,28.68 GB,30791089319,0
+ds003810,50,10,1,15,125,0.0,69.31 MB,72674251,0
+ds003969,392,98,4,64,"1024,2048",66.512,54.46 GB,58479195149,0
+ds004000,86,43,2,128,2048,0.0,22.50 GB,24161100810,0
+ds004995,20,20,1,,,0.0,27.60 GB,29637643188,0
+ds003638,57,57,1,64,512,40.597,16.31 GB,17516109722,0
+ds004521,34,34,1,62,250,0.057,10.68 GB,11470006201,0
+ds001849,120,20,1,30,5000,0.0,44.51 GB,47790431085,0
+ds004252,1,1,1,,,0.0,4.31 GB,4630172409,0
+ds004448,280,56,1,129,1000,43.732,38.17 GB,40980948240,0
+ds005795,39,34,2,72,500,0.0,6.43 GB,6902188541,0
+ds004018,32,16,1,63,1000,0.0,10.56 GB,11334174765,0
+ds004324,26,26,1,28,500,19.216,2.46 GB,2637689107,0
+ds003887,24,24,1,128,1000,0.0,80.10 GB,86007307086,0
+ds004860,31,31,1,32,"2048,512",0.0,3.79 GB,4065632222,0
+ds002721,185,31,6,19,1000,0.0,3.35 GB,3598851749,0
+ds003555,30,30,1,,1024,0.0,28.27 GB,30359240949,0
+ds005486,445,159,1,,"25000,5000",0.0,371.04 GB,398401152773,0
+ds005520,69,23,3,67,1000,60.73,275.98 GB,296326427308,0
+ds005262,186,12,1,,,0.0,688.75 MB,722211079,0
+ds002778,46,31,1,40,512,2.518,545.00 MB,571471228,0
+ds003885,24,24,1,128,1000,0.0,82.21 GB,88277188455,0
+ds005406,29,29,1,63,1000,15.452,13.26 GB,14241905076,0
+ds003710,48,13,1,32,5000,9.165,10.18 GB,10934708022,0
+ds003343,59,20,1,16,500,6.551,663.50 MB,695729345,0
+ds005345,26,26,1,64,500,0.0,405.13 GB,435000970369,0
+ds004067,84,80,1,63,2000,0.0,100.79 GB,108218050644,0
+ds001810,263,47,1,64,512,91.205,109.70 GB,117790096766,0
+ds005515,2516,533,8,129,500,198.849,160.55 GB,172385741878,0
+ds005516,3397,430,8,129,500,256.932,219.39 GB,235564761634,0

{eegdash-0.3.5.dev183002612 → eegdash-0.3.6.dev182011805/eegdash.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eegdash
-Version: 0.3.5.dev183002612
+Version: 0.3.6.dev182011805
 Summary: EEG data for machine learning
 Author-email: Young Truong <dt.young112@gmail.com>, Arnaud Delorme <adelorme@gmail.com>, Aviv Dotan <avivd220@gmail.com>, Oren Shriki <oren70@gmail.com>, Bruno Aristimunha <b.aristimunha@gmail.com>
 License-Expression: GPL-3.0-only

{eegdash-0.3.5.dev183002612 → eegdash-0.3.6.dev182011805}/eegdash.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ eegdash/features/feature_bank/signal.py
 eegdash/features/feature_bank/spectral.py
 eegdash/features/feature_bank/utils.py
 tests/test_api.py
+tests/test_challenge_kwargs.py
 tests/test_correctness.py
 tests/test_dataset.py
 tests/test_dataset_registration.py

eegdash-0.3.6.dev182011805/tests/test_challenge_kwargs.py

@@ -0,0 +1,52 @@
+from eegdash.api import EEGDashDataset
+from eegdash.dataset import EEGChallengeDataset
+
+
+def test_challenge_dataset_passes_task_and_dataset_filters(tmp_path):
+    ds = EEGChallengeDataset(
+        release="R5",
+        cache_dir=str(tmp_path),
+        mini=False,
+        task="RestingState",
+    )
+
+    assert len(ds.datasets) == 329
+    assert ds.datasets[0].record["dataset"] == "ds005509"
+
+
+def test_eegdashdataset_ignores_empty_query_when_kwargs_present(tmp_path):
+    _ = EEGDashDataset(
+        query={},
+        cache_dir=str(tmp_path),
+        dataset="ds005509",
+        task="RestingState",
+    )
+
+
+def test_challenge_dataset_task_list_propagation(tmp_path):
+    tasks = ["RestingState", "DespicableMe"]
+
+    _ = EEGChallengeDataset(
+        release="R5",
+        cache_dir=str(tmp_path),
+        mini=False,
+        task=tasks,
+    )
+
+
+def test_eegdashdataset_allows_raw_query_and_kwargs(tmp_path):
+    _ = EEGDashDataset(
+        query={"subject": {"$in": ["NDARAU708TL8", "NDARAP785CTE"]}},
+        cache_dir=str(tmp_path),
+        dataset="ds005509",
+        task="RestingState",
+    )
+
+
+def test_challenge_dataset_mini_populates_subjects(tmp_path):
+    _ = EEGChallengeDataset(
+        release="R5",
+        cache_dir=str(tmp_path),
+        mini=True,
+        task="RestingState",
+    )

{eegdash-0.3.5.dev183002612 → eegdash-0.3.6.dev182011805}/tests/test_init.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from mne import get_config
+from mne.utils import get_config
 from torch.utils.data import Dataset
 
 from eegdash import EEGDash, EEGDashDataset

{eegdash-0.3.5.dev183002612 → eegdash-0.3.6.dev182011805}/tests/test_minirelease.py

@@ -57,7 +57,9 @@ def test_minirelease_subject_raw_equivalence(warmed_mongo):
     subject = ds_mini_all.description["subject"].iloc[0]
 
     ds_mini = EEGChallengeDataset(
-        release=release, mini=True, cache_dir=EEG_CHALLENGE_CACHE_DIR, subject=subject
+        release=release,
+        mini=True,
+        cache_dir=EEG_CHALLENGE_CACHE_DIR,
     )
     ds_full = EEGChallengeDataset(
         release=release, mini=False, cache_dir=EEG_CHALLENGE_CACHE_DIR, subject=subject

{eegdash-0.3.5.dev183002612 → eegdash-0.3.6.dev182011805}/tests/test_query.py

@@ -83,3 +83,61 @@ def test_find_method_with_kwargs(eegdash_instance, mock_mongo_connection):
     # Assert that the method returned the mocked data
     assert len(results) == 1
     assert results[0]["dataset"] == "ds004"
+
+
+def test_find_method_with_query_and_kwargs_merging(
+    eegdash_instance, mock_mongo_connection
+):
+    """When both a raw query and kwargs are provided, they should be merged with $and."""
+    mock_mongo_connection.find.return_value = [{"_id": "xyz", "dataset": "ds010"}]
+
+    raw_query = {"dataset": "ds010", "subject": {"$in": ["sub-01", "sub-02"]}}
+    _ = eegdash_instance.find(raw_query, task="RestingState")
+
+    # Expect the final query to be an $and of raw_query and the built kwargs query
+    expected_kwargs_query = {"task": "RestingState"}
+    # We can't easily inspect the internal builder here, but we can check the structural call
+    called_with = mock_mongo_connection.find.call_args[0][0]
+    assert "$and" in called_with
+    assert raw_query in called_with["$and"]
+    assert expected_kwargs_query in called_with["$and"]
+
+
+def test_find_conflict_on_duplicate_task_raises(
+    eegdash_instance, mock_mongo_connection
+):
+    """If the same field is given in both raw query and kwargs with conflicting values, raise."""
+    raw_query = {"task": "RestingState"}
+    with pytest.raises(ValueError, match="Conflicting constraints for 'task'"):
+        _ = eegdash_instance.find(raw_query, task="DespicableMe")
+    mock_mongo_connection.find.assert_not_called()
+
+
+def test_find_duplicate_task_consistent_ok(eegdash_instance, mock_mongo_connection):
+    """No error when duplicate field constraints are compatible (e.g., $in contains scalar)."""
+    mock_mongo_connection.find.return_value = []
+    raw_query = {"task": {"$in": ["RestingState", "DespicableMe"]}}
+    _ = eegdash_instance.find(raw_query, task="RestingState")
+    called_with = mock_mongo_connection.find.call_args[0][0]
+    assert "$and" in called_with
+
+
+def test_find_all_documents_with_empty_query(eegdash_instance, mock_mongo_connection):
+    mock_mongo_connection.find.return_value = [{"_id": "1"}]
+    res = eegdash_instance.find({})
+    mock_mongo_connection.find.assert_called_once_with({})
+    assert len(res) == 1
+
+
+def test_build_query_rejects_none_and_empty(eegdash_instance):
+    with pytest.raises(ValueError, match="None for query parameter 'task'"):
+        eegdash_instance._build_query_from_kwargs(task=None)
+    with pytest.raises(ValueError, match="empty string for query parameter 'task'"):
+        eegdash_instance._build_query_from_kwargs(task="   ")
+
+
+def test_build_query_cleans_list_values(eegdash_instance):
+    q = eegdash_instance._build_query_from_kwargs(
+        task=[" A ", None, "B", "", "A"]
+    )  # dedupe + strip
+    assert q == {"task": {"$in": ["A", "B"]}}

eegdash-0.3.5.dev183002612/eegdash/dataset_summary.csv

@@ -1,255 +0,0 @@
-dataset,n_records,n_subjects,n_tasks,nchans_set,sampling_freqs,duration_hours_total
-ds002718,18,18,1,74,250,14.844
-ds005505,1342,136,10,129,500,125.366
-ds004745,6,6,1,,1000,0.0
-ds005514,2885,295,10,129,500,213.008
-ds005512,2320,257,10,129,500,196.205
-ds005510,1227,135,10,129,500,112.464
-ds005511,3100,381,10,"6,129",500,285.629
-ds005509,3326,330,10,129,500,274.559
-ds005508,3342,324,10,129,500,269.281
-ds005507,1812,184,10,129,500,168.649
-ds005506,1405,150,10,129,500,127.896
-ds004854,1,1,1,64,128,0.535
-ds004853,1,1,1,64,128,0.535
-ds004844,68,17,1,64,1024,21.252
-ds004843,92,14,1,64,256,29.834
-ds004842,102,14,1,64,256,20.102
-ds004852,1,1,1,64,128,0.535
-ds004851,1,1,1,64,128,0.535
-ds004850,1,1,1,64,128,0.535
-ds004855,1,1,1,64,128,0.535
-ds004849,1,1,1,64,128,0.535
-ds004841,147,20,1,64,256,29.054
-ds004661,17,17,1,64,128,10.137
-ds004660,42,21,1,32,"2048,512",23.962
-ds004657,119,24,1,64,"1024,8192",27.205
-ds004362,1526,109,1,64,"128,160",48.592
-ds004010,24,24,1,64,1000,26.457
-ds002181,226,226,1,125,500,7.676
-ds004554,16,16,1,99,1000,0.024
-ds005697,50,50,1,"65,69",1000,77.689
-ds004350,240,24,5,64,256,41.265
-ds004785,17,17,1,32,500,0.019
-ds004504,88,88,1,19,500,19.608
-ds004635,55,55,1,129,1000,20.068
-ds005787,448,19,1,"64,66","1000,500",23.733
-ds005079,60,1,15,65,500,3.25
-ds005342,32,32,1,17,250,33.017
-ds005034,100,25,2,129,1000,37.525
-ds002680,350,14,1,31,1000,21.244
-ds003805,1,1,1,19,500,0.033
-ds003838,130,65,2,63,1000,136.757
-ds002691,20,20,1,32,250,6.721
-ds003690,375,75,3,"64,66",500,46.771
-ds004040,4,2,1,64,512,4.229
-ds003061,39,13,1,79,256,8.196
-ds005672,3,3,1,"65,69",1000,4.585
-ds005410,81,81,1,63,1000,22.976
-ds003753,25,25,1,64,500,10.104
-ds005565,24,24,1,,500,11.436
-ds002893,52,49,1,33,"250,250.0293378038558",36.114
-ds002578,2,2,1,256,256,1.455
-ds005089,36,36,1,63,1000,68.82
-ds003822,25,25,1,64,500,12.877
-ds003670,62,25,1,32,2000,72.772
-ds005048,35,35,1,,250,5.203
-ds004574,146,146,1,"63,64,66",500,31.043
-ds004519,40,40,1,62,250,0.067
-ds004602,546,182,3,128,"250,500",87.11
-ds004784,6,1,6,128,512,0.518
-ds004771,61,61,1,34,256,0.022
-ds003518,137,110,1,64,500,89.888
-ds005207,39,20,1,"6,10,12,14,15,16,17,18","128,250",422.881
-ds005866,60,60,1,,500,15.976
-ds003523,221,91,1,64,500,84.586
-ds004347,48,24,1,64,"128,512",6.389
-ds004588,42,42,1,24,300,4.957
-ds005811,448,19,1,62,"1000,500",23.733
-ds003987,69,23,1,64,500.0930232558139,52.076
-ds004317,50,50,1,60,500,37.767
-ds004033,36,18,2,64,500,42.645
-ds004315,50,50,1,60,500,21.104
-ds003474,122,122,1,64,500,36.61
-ds003509,84,56,1,64,500,48.535
-ds005868,48,48,1,,500,13.094
-ds003516,25,25,1,47,500,22.57
-ds004942,62,62,1,65,1000,28.282
-ds004348,18,9,2,34,200,35.056
-ds004625,543,32,9,120,500,28.397
-ds003517,34,17,1,64,500,13.273
-ds004368,40,39,1,63,128,0.033
-ds004584,149,149,1,"63,64,66",500,6.641
-ds003506,84,56,1,64,500,35.381
-ds003570,40,40,1,64,2048,26.208
-ds003490,75,50,1,64,500,12.76
-ds004117,85,23,1,69,"1000,250,500,500.059",15.941
-ds004505,25,25,1,120,250,30.398
-ds004580,147,147,1,"63,64,66",500,36.514
-ds004532,137,110,1,64,500,49.651
-ds004902,218,71,2,61,"500,5000",18.118
-ds004295,26,26,1,66,"1024,512",34.313
-ds003519,54,27,1,64,500,20.504
-ds003458,23,23,1,64,500,10.447
-ds003004,34,34,1,"134,180,189,196,201,206,207,208,209,211,212,213,214,215,218,219,220,221,222,223,224,226,227,229,231,232,235",256,49.072
-ds004200,20,20,1,37,1000,14.123
-ds004015,36,36,1,18,500,47.29
-ds004595,53,53,1,64,500,17.078
-ds004626,52,52,1,68,1000,21.359
-ds004475,30,30,1,"113,115,118,119,120,122,123,124,125,126,127,128",512,26.899
-ds004515,54,54,1,64,500,20.61
-ds004883,516,172,3,128,500,137.855
-ds003739,120,30,4,128,256,20.574
-ds004389,260,26,4,42,10000,30.932
-ds004367,40,40,1,68,1200,24.81
-ds004369,41,41,1,4,500,37.333
-ds004579,139,139,1,"63,64,66",500,55.703
-ds005416,23,23,1,64,1000,24.68
-ds001785,54,18,3,63,"1000,1024",14.644
-ds001971,273,20,1,108,512,46.183
-ds004388,399,40,3,67,10000,43.327
-ds003478,243,122,1,64,500,23.57
-ds004306,15,12,1,124,1024,18.183
-ds005305,165,165,1,64,"2048,512",14.136
-ds005114,223,91,1,64,500,125.701
-ds003039,16,16,1,64,500,14.82
-ds003602,699,118,6,35,1000,159.35
-ds003655,156,156,1,19,500,130.923
-ds003522,200,96,1,64,500,57.079
-ds003801,20,20,1,24,250,13.689
-ds005296,62,62,1,,500,37.205
-ds004561,23,23,1,62,10000,11.379
-ds005131,63,58,2,64,500,52.035
-ds005028,66,11,3,,,0.0
-ds005170,225,5,1,,,0.0
-ds004840,51,9,3,8,"1024,256,512",11.306
-ds004718,51,51,1,64,1000,21.836
-ds002725,105,21,5,30,1000,0.0
-ds004408,380,19,1,128,512,20.026
-ds004796,235,79,3,,1000,0.0
-ds004511,134,45,3,139,3000,48.922
-ds004817,20,20,1,63,1000,0.0
-ds003190,280,19,1,0,256,29.891
-ds004917,24,24,1,,,0.0
-ds004357,16,16,1,63,1000,0.0
-ds005397,26,26,1,64,500,27.923
-ds003846,60,19,1,64,500,24.574
-ds004024,497,13,3,64,20000,55.503
-ds005815,137,26,4,30,"1000,500",38.618
-ds005429,61,15,3,64,"2500,5000",14.474
-ds003702,47,47,1,61,500,0.0
-ds004577,130,103,1,"19,21,24",200,22.974
-ds003574,18,18,1,64,500,0.0
-ds005779,250,19,16,"64,67,70",5000,16.65
-ds005185,356,20,3,8,500,0.0
-ds001787,40,24,1,64,256,27.607
-ds003505,37,19,2,128,2048,0.0
-ds005340,15,15,1,2,10000,35.297
-ds005363,43,43,1,64,1000,43.085
-ds005121,39,34,1,58,512,41.498
-ds004256,53,53,2,64,500,42.337
-ds005420,72,37,2,20,500,5.485
-ds002034,167,14,4,64,512,37.248
-ds003825,50,50,1,"63,128",1000,0.0
-ds004587,114,103,1,59,10000,25.491
-ds004598,20,9,1,,10000,0.0
-ds005383,240,30,1,30,200,8.327
-ds003195,20,10,2,19,200,4.654
-ds005403,32,32,1,62,10000,13.383
-ds004621,167,42,4,,1000,0.0
-ds005863,357,127,4,27,500,0.0
-ds005594,16,16,1,64,1000,12.934
-ds002336,54,10,6,,5000,0.0
-ds004043,20,20,1,63,1000,0.0
-ds005106,42,42,1,32,500,0.012
-ds004284,18,18,1,129,1000,9.454
-ds005620,202,21,3,"64,65",5000,21.811
-ds002720,165,18,10,19,1000,0.0
-ds005307,73,7,1,"72,104",10000,1.335
-ds002094,43,20,3,30,5000,18.593
-ds002833,80,20,1,257,1000,11.604
-ds002218,18,18,1,0,256,16.52
-ds005021,36,36,1,64,1024,0.0
-ds004264,21,21,1,31,1000,0.0
-ds004446,237,30,1,129,1000,33.486
-ds004980,17,17,1,64,"499.9911824,499.9912809,499.991385,499.9914353,499.9914553,499.9915179,499.9917272,499.9917286,499.9917378,499.9919292,499.9919367,499.9923017,499.9923795,500",36.846
-ds002722,94,19,5,32,1000,0.0
-ds003944,82,82,1,61,"1000,3000.00030000003",6.999
-ds004279,60,56,1,64,1000,53.729
-ds005876,29,29,1,32,1000,16.017
-ds003816,1077,48,8,127,1000,159.313
-ds005385,3264,608,2,64,1000,169.62
-ds004572,516,52,10,58,1000,52.624
-ds005095,48,48,1,63,1000,16.901
-ds004460,40,20,1,160,1000,27.494
-ds005189,30,30,1,61,1000,0.0
-ds005274,22,22,1,6,500,0.0
-ds004075,116,29,4,,1000,0.0
-ds004447,418,22,1,"128,129",1000,23.554
-ds004952,245,10,1,128,1000,123.411
-ds002724,96,10,4,32,1000,0.0
-ds005571,45,24,2,64,5000,0.0
-ds004262,21,21,1,31,1000,0.0
-ds005273,33,33,1,63,1000,58.055
-ds004520,33,33,1,62,250,0.055
-ds004444,465,30,1,129,1000,55.687
-ds004582,73,73,1,59,10000,34.244
-ds002723,44,8,6,32,1000,0.0
-ds003751,38,38,1,128,250,19.95
-ds003421,80,20,1,257,1000,11.604
-ds002158,117,20,1,,,0.0
-ds004951,23,11,1,63,1000,29.563
-ds004802,38,38,1,65,"2048,512",0.0
-ds004816,20,20,1,63,1000,0.0
-ds005873,2850,125,1,2,256,11935.09
-ds003194,29,15,2,"19,21",200,7.178
-ds004356,24,22,1,34,10000,0.0
-ds004381,437,18,1,"4,5,7,8,10",20000,11.965
-ds004196,4,4,1,64,512,1.511
-ds005692,59,30,1,24,5000,112.206
-ds002338,85,17,4,,5000,0.0
-ds004022,21,7,1,"16,18",500,0.0
-ds004603,37,37,1,64,1024,30.653
-ds004752,136,15,1,"0,8,10,19,20,21,23","200,2000,4000,4096",0.302
-ds003768,255,33,2,,,0.0
-ds003947,61,61,1,61,"1000,3000.00030000003",5.266
-ds005530,21,17,1,10,500,154.833
-ds005555,256,128,1,"2,8,9,11,12,13",256,2002.592
-ds004477,9,9,1,79,2048,13.557
-ds005688,89,20,5,4,"10000,20000",2.502
-ds003766,124,31,4,129,1000,39.973
-ds005540,103,59,1,64,"1200,600",0.0
-ds004152,21,21,1,31,1000,0.0
-ds003626,30,10,1,,,0.0
-ds002814,168,21,1,68,1200,0.0
-ds003645,108,18,1,,,0.0
-ds005586,23,23,1,60,1000,33.529
-ds003810,50,10,1,15,125,0.0
-ds003969,392,98,4,64,"1024,2048",66.512
-ds004000,86,43,2,128,2048,0.0
-ds004995,20,20,1,,,0.0
-ds003638,57,57,1,64,512,40.597
-ds004521,34,34,1,62,250,0.057
-ds001849,120,20,1,30,5000,0.0
-ds004252,1,1,1,,,0.0
-ds004448,280,56,1,129,1000,43.732
-ds005795,39,34,2,72,500,0.0
-ds004018,32,16,1,63,1000,0.0
-ds004324,26,26,1,28,500,19.216
-ds003887,24,24,1,128,1000,0.0
-ds004860,31,31,1,32,"2048,512",0.0
-ds002721,185,31,6,19,1000,0.0
-ds003555,30,30,1,,1024,0.0
-ds005486,445,159,1,,"25000,5000",0.0
-ds005520,69,23,3,67,1000,60.73
-ds005262,186,12,1,,,0.0
-ds002778,46,31,1,40,512,2.518
-ds003885,24,24,1,128,1000,0.0
-ds005406,29,29,1,63,1000,15.452
-ds003710,48,13,1,32,5000,9.165
-ds003343,59,20,1,16,500,6.551
-ds005345,26,26,1,64,500,0.0
-ds004067,84,80,1,63,2000,0.0
-ds001810,263,47,1,64,512,91.205
-ds005515,2516,533,8,129,500,198.849
-ds005516,3397,430,8,129,500,256.932