Skip to content

Commit 9fc0e53

Browse files
authored
Merge pull request #11 from PLAID-lib/main_s
Main s
2 parents b8e2673 + 8267ab3 commit 9fc0e53

File tree

9 files changed

+202
-103
lines changed

9 files changed

+202
-103
lines changed

docs/source/notebooks/dataset.ipynb

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"outputs": [],
2626
"source": [
2727
"# Import required libraries\n",
28-
"import numpy as np\n",
29-
"import os"
28+
"from pathlib import Path\n",
29+
"import numpy as np"
3030
]
3131
},
3232
{
@@ -40,6 +40,7 @@
4040
"from Muscat.Bridges.CGNSBridge import MeshToCGNS\n",
4141
"from Muscat.Containers import MeshCreationTools as MCT\n",
4242
"\n",
43+
"import plaid\n",
4344
"from plaid.containers.dataset import Dataset\n",
4445
"from plaid.containers.sample import Sample"
4546
]
@@ -614,9 +615,7 @@
614615
"metadata": {},
615616
"outputs": [],
616617
"source": [
617-
"empty_ds = Dataset()\n",
618-
"nb_samples = empty_ds._load_number_of_samples_(tmpdir)\n",
619-
"\n",
618+
"nb_samples = plaid.get_number_of_samples(tmpdir)\n",
620619
"print(f\"{nb_samples = }\")"
621620
]
622621
},
@@ -696,8 +695,8 @@
696695
"metadata": {},
697696
"outputs": [],
698697
"source": [
699-
"tmpdir = f'/tmp/test_safe_to_delete_{np.random.randint(1e10,1e12)}'\n",
700-
"tmpfile = os.path.join(tmpdir, 'test_file.plaid')\n",
698+
"tmpdir = Path(f'/tmp/test_safe_to_delete_{np.random.randint(1e10,1e12)}')\n",
699+
"tmpfile = tmpdir / 'test_file.plaid'\n",
701700
"\n",
702701
"print(f\"Save dataset in: {tmpfile}\")\n",
703702
"dataset.save(tmpfile)"

examples/containers/dataset_example.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from Muscat.Bridges.CGNSBridge import MeshToCGNS
2424
from Muscat.Containers import MeshCreationTools as MCT
2525

26+
import plaid
2627
from plaid.containers.dataset import Dataset
2728
from plaid.containers.sample import Sample
2829

@@ -339,10 +340,18 @@ def dprint(name: str, dictio: dict, end: str = "\n"):
339340
# ### Get the number of Samples that can be loaded from a directory
340341

341342
# %%
342-
nb_samples = Dataset._load_number_of_samples_(tmpdir)
343+
nb_samples = plaid.get_number_of_samples(tmpdir)
343344

344345
print(f"{nb_samples = }")
345346

347+
# %% [markdown]
348+
# ### Get the Samples ids that can be loaded from a directory
349+
350+
# %%
351+
sample_ids = plaid.get_sample_ids(tmpdir)
352+
353+
print(f"{sample_ids = }")
354+
346355
# %% [markdown]
347356
# ### Load a Dataset from a directory via initialization
348357

src/plaid/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@
1010
except ImportError:
1111
__version__ = "None"
1212

13-
__all__ = ["__version__"]
13+
__all__ = ["__version__"]
14+
15+
from .containers.utils import get_number_of_samples, get_sample_ids

0 commit comments

Comments
 (0)