modified: dsm.py

autonlab · Apr 2, 2020 · 4ae287b · 4ae287b
1 parent d47ce90
commit 4ae287b
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/dsm.py b/dsm.py
@@ -13,9 +13,26 @@ def __init__(self, inputdim, k, mlptyp=1, HIDDEN=None, init=False, dist='Weibull
         self.k = k
 
         self.mlptype = mlptyp
-        self.scale = nn.Parameter(-torch.ones(k))
-        self.shape = nn.Parameter(-torch.ones(k))
+
+
+
+        self.dist = dist
 
+        if self.dist == 'Weibull':
+
+            self.act = nn.SELU()
+
+            self.scale = nn.Parameter(-torch.ones(k))
+            self.shape = nn.Parameter(-torch.ones(k))
+
+
+        elif self.dist == 'LogNormal':
+
+            self.act = nn.Tanh()
+            self.scale = nn.Parameter(torch.ones(k))
+            self.shape = nn.Parameter(torch.ones(k))
+
+
         self.HIDDEN = HIDDEN
 
 
@@ -96,15 +113,7 @@ def __init__(self, inputdim, k, mlptyp=1, HIDDEN=None, init=False, dist='Weibull
             self.scale.data.fill_(init[1])
 
 
-        self.dist = dist
-
-        if self.dist == 'Weibull':
-
-            self.act = nn.SELU()
-
-        elif self.dist == 'LogNormal':
-
-            self.act = nn.Tanh()
+
 
     def forward(self, x, adj=True):