dsipts 1.1.9__tar.gz → 1.1.10__tar.gz

{dsipts-1.1.9 → dsipts-1.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsipts
-Version: 1.1.9
+Version: 1.1.10
 Summary: Unified library for timeseries modelling
 Author-email: Andrea Gobbi <agobbi@fbk.eu>
 Project-URL: Homepage, https://github.com/DSIP-FBK/DSIPTS

{dsipts-1.1.9 → dsipts-1.1.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dsipts"
-version = "1.1.9"
+version = "1.1.10"
 description = "Unified library for timeseries modelling"
 readme = "README.md"
 requires-python = "==3.11.13"

{dsipts-1.1.9 → dsipts-1.1.10}/src/dsipts/models/base.py

@@ -136,9 +136,9 @@ class Base(pl.LightningModule):
             self.is_classification = False
             if len(self.quantiles)>0:
                 if self.loss_type=='cprs':
-                    self.use_quantiles = False
+                    self.use_quantiles = True
                     self.mul = len(self.quantiles)
-                    self.loss = CPRS()
+                    self.loss = CPRS(alpha=self.persistence_weight)
                 else:
                     assert len(self.quantiles)==3, beauty_string('ONLY 3 quantiles premitted','info',True)
                     self.use_quantiles = True
@@ -193,7 +193,9 @@ class Base(pl.LightningModule):
         """
         if self.loss_type=='cprs':
             tmp = self(batch)
-            return tmp.mean(axis=-1)
+            tmp = torch.quantile(tmp, torch.tensor([0.05, 0.5, 0.95]), dim=-1).permute(1,2,3,0)
+            return tmp
+            #return tmp.mean(axis=-1).unsqueeze(-1)
         
         return self(batch)
         

{dsipts-1.1.9 → dsipts-1.1.10}/src/dsipts/models/base_v2.py

@@ -138,9 +138,9 @@ class Base(pl.LightningModule):
             self.is_classification = False
             if len(self.quantiles)>0:
                 if self.loss_type=='cprs':
-                    self.use_quantiles = False
+                    self.use_quantiles = True
                     self.mul = len(self.quantiles)
-                    self.loss = CPRS()
+                    self.loss = CPRS(alpha=self.persistence_weight)
                 else:
                     assert len(self.quantiles)==3, beauty_string('ONLY 3 quantiles premitted','info',True)
                     self.use_quantiles = True
@@ -197,7 +197,9 @@ class Base(pl.LightningModule):
         
         if self.loss_type=='cprs':
             tmp = self(batch)
-            return tmp.mean(axis=-1)
+            tmp = torch.quantile(tmp, torch.tensor([0.05, 0.5, 0.95]), dim=-1).permute(1,2,3,0)
+            return tmp
+            #return tmp.mean(axis=-1).unsqueeze(-1)
         
         return self(batch)
         

{dsipts-1.1.9 → dsipts-1.1.10}/src/dsipts/models/utils.py

@@ -633,7 +633,7 @@ class CPRS(nn.Module):
     with large ensembles.
     """
     
-    def __init__(self, alpha=0.95, reduction='mean'):
+    def __init__(self, alpha=0.5, reduction='mean'):
         super().__init__()
         self.alpha = alpha
         self.reduction = reduction
@@ -674,17 +674,19 @@ class CPRS(nn.Module):
         # Create mask to exclude diagonal (i=j)
         mask = ~torch.eye(n_members, dtype=torch.bool, device=ensemble.device)
         mask = mask.view(1, n_members, n_members, *[1]*(len(ensemble.shape)-2))
-        
+
         # Apply mask and compute mean
-        pairwise_term = (pairwise_diffs * mask).sum(dim=(1, 2)) / (n_members * (n_members - 1))
+        pairwise_term = (pairwise_diffs * mask).sum(dim=(1, 2)) ##formula 3 second term 
         
         # Combine terms according to afCRPS formula
-        loss = mae_term - (1 - epsilon) * pairwise_term
+        loss = mae_term - (1 - epsilon) * pairwise_term/ (2*n_members * (n_members - 1))
         
         # Apply weights if provided
         if weights is not None:
             loss = loss * weights
-            
+        #if loss.mean()<-2:
+        #    import pdb
+        #    pdb.set_trace()
         # Apply reduction
         if self.reduction == 'none':
             return loss

{dsipts-1.1.9 → dsipts-1.1.10}/src/dsipts.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsipts
-Version: 1.1.9
+Version: 1.1.10
 Summary: Unified library for timeseries modelling
 Author-email: Andrea Gobbi <agobbi@fbk.eu>
 Project-URL: Homepage, https://github.com/DSIP-FBK/DSIPTS