Adapt to restructuration in Deck

jhadida · Oct 30, 2018 · a06b0e3 · a06b0e3
1 parent 2c63e4e
commit a06b0e3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/GPSO.m b/GPSO.m
@@ -301,7 +301,7 @@
 
                 self.info('\tHyperparameter update (nsplit=%d).',upn);
                 self.srgt.gp_update();
-                upn = dk.math.nextint( Nsplit/upc );
+                upn = dk.num.nextint( Nsplit/upc );
                 self.notify( 'PostUpdate' );
 
             end
@@ -313,7 +313,7 @@
 
                 self.info('\tHyperparameter update (nsplit=%d).',upn);
                 self.srgt.gp_update();
-                upn = dk.math.nextint( (sqrt(1+8*Nsplit/upc)-1)/2 );
+                upn = dk.num.nextint( (sqrt(1+8*Nsplit/upc)-1)/2 );
                 self.notify( 'PostUpdate' );
 
             end

diff --git a/GP_Surrogate.m b/GP_Surrogate.m
@@ -358,8 +358,8 @@
                 @infExact, self.GP.meanfunc, self.GP.covfunc, self.GP.likfunc, xe, fe );
 
             % don't allow scale parameters to become too small or too big
-            self.GP.hyp.lik = dk.math.clamp( self.GP.hyp.lik, self.LIK_BND );
-            self.GP.hyp.cov(1) = dk.math.clamp( self.GP.hyp.cov(1), self.COV_BND );
+            self.GP.hyp.lik = dk.num.clamp( self.GP.hyp.lik, self.LIK_BND );
+            self.GP.hyp.cov(1) = dk.num.clamp( self.GP.hyp.cov(1), self.COV_BND );
 
             % re-evaluate all gp-based samples
             if self.Ng > 0

diff --git a/dev/GPSO_v2.m b/dev/GPSO_v2.m
@@ -273,7 +273,7 @@
 
                 self.info('\tHyperparameter update (n=%d).',upn);
                 self.srgt.gp_update();
-                upn = dk.math.nextint( Nsplit/upc );
+                upn = dk.num.nextint( Nsplit/upc );
                 self.notify( 'PostUpdate' );
 
             end
@@ -285,7 +285,7 @@
 
                 self.info('\tHyperparameter update (n=%d).',upn);
                 self.srgt.gp_update();
-                upn = dk.math.nextint( (sqrt(1+8*Nsplit/upc)-1)/2 );
+                upn = dk.num.nextint( (sqrt(1+8*Nsplit/upc)-1)/2 );
                 self.notify( 'PostUpdate' );
 
             end

diff --git a/dev/GPSO_v3.m b/dev/GPSO_v3.m
@@ -291,7 +291,7 @@
 
                 self.info('\tHyperparameter update (n=%d).',upn);
                 self.srgt.gp_update();
-                upn = dk.math.nextint( Nsplit/upc );
+                upn = dk.num.nextint( Nsplit/upc );
                 self.notify( 'PostUpdate' );
 
             end
@@ -303,7 +303,7 @@
 
                 self.info('\tHyperparameter update (n=%d).',upn);
                 self.srgt.gp_update();
-                upn = dk.math.nextint( (sqrt(1+8*Nsplit/upc)-1)/2 );
+                upn = dk.num.nextint( (sqrt(1+8*Nsplit/upc)-1)/2 );
                 self.notify( 'PostUpdate' );
 
             end

diff --git a/dev/GP_Surrogate_v3.m b/dev/GP_Surrogate_v3.m
@@ -327,7 +327,7 @@
                 @infExact, self.GP.meanfunc, self.GP.covfunc, self.GP.likfunc, xe, fe );
 
             % don't allow sigma to become too small or too big
-            self.GP.hyp.lik = dk.math.clamp( self.GP.hyp.lik, self.LIK_BND );
+            self.GP.hyp.lik = dk.num.clamp( self.GP.hyp.lik, self.LIK_BND );
 
             % re-evaluate all gp-based samples
             if self.Ng > 0