Fix bugs in DataLoader and tutorial5 notebook

pina/__init__.py

@@ -1,17 +1,17 @@
 __all__ = [
-    "Trainer", "LabelTensor", "Plotter", "Condition", "SamplePointDataset",
-    "PinaDataModule", "PinaDataLoader", 'TorchOptimizer', 'Graph'
+    "Trainer", "LabelTensor", "Plotter", "Condition",
+    "PinaDataModule", 'TorchOptimizer', 'Graph', 'LabelParameter'
 ]
 
 from .meta import *
-from .label_tensor import LabelTensor
+from .label_tensor import LabelTensor, LabelParameter
 from .solvers.solver import SolverInterface
 from .trainer import Trainer
 from .plotter import Plotter
 from .condition.condition import Condition
-from .data import SamplePointDataset
+
 from .data import PinaDataModule
-from .data import PinaDataLoader
+
 from .optim import TorchOptimizer
 from .optim import TorchScheduler
 from .graph import Graph

pina/collector.py

@@ -68,7 +68,7 @@ def store_sample_domains(self, n, mode, variables, sample_locations):
             condition = self.problem.conditions[loc]
             keys = ["input_points", "equation"]
             # if the condition is not ready, we get and store the data
-            if (not self._is_conditions_ready[loc]):
+            if not self._is_conditions_ready[loc]:
                 # if it is the first time we sample
                 if not self.data_collections[loc]:
                     already_sampled = []
@@ -87,7 +87,7 @@ def store_sample_domains(self, n, mode, variables, sample_locations):
                 condition.domain.sample(n=n, mode=mode, variables=variables)
             ] + already_sampled
             pts = merge_tensors(samples)
-            if (set(pts.labels).issubset(sorted(self.problem.input_variables))):
+            if set(pts.labels).issubset(sorted(self.problem.input_variables)):
                 pts = pts.sort_labels()
                 if sorted(pts.labels) == sorted(self.problem.input_variables):
                     self._is_conditions_ready[loc] = True

pina/condition/data_condition.py

@@ -15,15 +15,15 @@ class DataConditionInterface(ConditionInterface):
     """
 
     __slots__ = ["input_points", "conditional_variables"]
+    condition_type = ['unsupervised']
 
     def __init__(self, input_points, conditional_variables=None):
         """
-        TODO
+        TODO : add docstring
         """
         super().__init__()
         self.input_points = input_points
         self.conditional_variables = conditional_variables
-        self._condition_type = 'unsupervised'
 
     def __setattr__(self, key, value):
         if (key == 'input_points') or (key == 'conditional_variables'):

pina/condition/domain_equation_condition.py

@@ -13,15 +13,14 @@ class DomainEquationCondition(ConditionInterface):
     """
 
     __slots__ = ["domain", "equation"]
-
+    condition_type = ['physics']
     def __init__(self, domain, equation):
         """
-        TODO
+        TODO : add docstring
         """
         super().__init__()
         self.domain = domain
         self.equation = equation
-        self._condition_type = 'physics'
 
     def __setattr__(self, key, value):
         if key == 'domain':

pina/condition/input_equation_condition.py

@@ -14,15 +14,14 @@ class InputPointsEquationCondition(ConditionInterface):
     """
 
     __slots__ = ["input_points", "equation"]
-
+    condition_type = ['physics']
     def __init__(self, input_points, equation):
         """
-        TODO
+        TODO : add docstring
         """
         super().__init__()
         self.input_points = input_points
         self.equation = equation
-        self._condition_type = 'physics'
 
     def __setattr__(self, key, value):
         if key == 'input_points':

pina/condition/input_output_condition.py

@@ -13,15 +13,14 @@ class InputOutputPointsCondition(ConditionInterface):
     """
 
     __slots__ = ["input_points", "output_points"]
-
+    condition_type = ['supervised']
     def __init__(self, input_points, output_points):
         """
-        TODO
+        TODO : add docstring
         """
         super().__init__()
         self.input_points = input_points
         self.output_points = output_points
-        self._condition_type = ['supervised', 'physics']
 
     def __setattr__(self, key, value):
         if (key == 'input_points') or (key == 'output_points'):

pina/data/__init__.py

@@ -2,14 +2,11 @@
 Import data classes
 """
 __all__ = [
-    'PinaDataLoader', 'SupervisedDataset', 'SamplePointDataset',
-    'UnsupervisedDataset', 'Batch', 'PinaDataModule', 'BaseDataset'
+    'PinaDataModule',
+    'PinaDataset'
 ]
 
-from .pina_dataloader import PinaDataLoader
-from .supervised_dataset import SupervisedDataset
-from .sample_dataset import SamplePointDataset
-from .unsupervised_dataset import UnsupervisedDataset
-from .pina_batch import Batch
+
+
 from .data_module import PinaDataModule
-from .base_dataset import BaseDataset
+from .data_module import  PinaDataset