fixes

Author: FilippoOlivo

pina/_src/condition/condition_base.py

@@ -34,10 +34,7 @@ def __init__(self, **kwargs):
         """
         super().__init__()
         self.data = self.store_data(**kwargs)
-<<<<<<< HEAD
         self.has_custom_dataloader_fn = False
-=======
->>>>>>> 4ca4993a (Conditions refactoring (#758))
 
     @property
     def problem(self):
@@ -90,12 +87,8 @@ def automatic_batching_collate_fn(cls, batch):
         if not batch:
             return {}
         instance_class = batch[0].__class__
-<<<<<<< HEAD
         batch = instance_class.create_batch(batch)
         return batch
-=======
-        return instance_class.create_batch(batch)
->>>>>>> 4ca4993a (Conditions refactoring (#758))
 
     @staticmethod
     def collate_fn(batch, condition):
@@ -113,15 +106,11 @@ def collate_fn(batch, condition):
         return data
 
     def create_dataloader(
-<<<<<<< HEAD
         self,
         dataset,
         batch_size,
         automatic_batching,
         **kwargs,
-=======
-        self, dataset, batch_size, shuffle, automatic_batching
->>>>>>> 4ca4993a (Conditions refactoring (#758))
     ):
         """
         Create a DataLoader for the condition.
@@ -132,23 +121,14 @@ def create_dataloader(
         :rtype: torch.utils.data.DataLoader
         """
         if batch_size == len(dataset):
-<<<<<<< HEAD
             return DummyDataloader(dataset)
         return DataLoader(
             dataset=dataset,
-=======
-            pass  # will be updated in the near future
-        return DataLoader(
-            dataset=dataset,
-            batch_size=batch_size,
-            shuffle=shuffle,
->>>>>>> 4ca4993a (Conditions refactoring (#758))
             collate_fn=(
                 partial(self.collate_fn, condition=self)
                 if not automatic_batching
                 else self.automatic_batching_collate_fn
             ),
-<<<<<<< HEAD
             batch_size=batch_size,
             **kwargs,
         )
@@ -166,6 +146,3 @@ def switch_dataloader_fn(self, create_dataloader_fn):
         # the new function
         self.has_custom_dataloader_fn = True
         self.create_dataloader = create_dataloader_fn
-=======
-        )
->>>>>>> 4ca4993a (Conditions refactoring (#758))

pina/_src/condition/domain_equation_condition.py

@@ -31,11 +31,7 @@ class DomainEquationCondition(ConditionBase):
     # Available slots
     __fields__ = ["domain", "equation"]
 
-<<<<<<< HEAD
     _avail_domain_cls = (DomainInterface, str)
-=======
-    _avail_domain_cls = DomainInterface
->>>>>>> 4ca4993a (Conditions refactoring (#758))
     _avail_equation_cls = EquationInterface
 
     def __new__(cls, domain, equation):