adjusted incSliceLineFull for renamed symbol, cleanup code

fzoepffel · Aug 6, 2024 · 9e86cf6 · 9e86cf6
1 parent 9224d52
commit 9e86cf6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/scripts/builtin/incSliceLine.dml b/scripts/builtin/incSliceLine.dml
@@ -150,12 +150,9 @@ m_incSliceLine = function(
   minsc = -Inf;
   if( nrow(prevTK2) > 0 ) {
     [minsc] = computeLowestPrevTK (prevTK2, X2, totalE, eAvg, alpha, minsc)
-    print("minsc: "+minsc);
   } 
 
-  t2 = time();
   [S, R, selCols] = createAndScoreBasicSlices(X2, addedX2, prevTK2, totalE, eAvg, eAvgOld, eAvgNew, minSup, alpha, minsc, verbose);
-  print("IncSliceLine: Time taken for basic slices: "+(time()-t2));
 
   # initialize Lattice and Statistics
   Stats = list();
@@ -188,7 +185,6 @@ m_incSliceLine = function(
   # termination condition (max #feature levels)
   maxL = ifelse(maxL<=0, n, maxL)
   level = 1;
-  t3 = time();
   while( nrow(S) > 0 & sum(S) > 0 & level < n & level < maxL ) {
     level = level + 1;
 
@@ -268,7 +264,6 @@ m_incSliceLine = function(
       }
     }
   }
-  print("IncSliceLine: Time taken for lattice enumeration: "+(time()-t3));
 
   TK = decodeOneHot(TK, foffb, foffe);
 

diff --git a/src/test/scripts/functions/builtin/incSliceLineFull.dml b/src/test/scripts/functions/builtin/incSliceLineFull.dml
@@ -31,7 +31,7 @@ totalE = rbind(oldE, addedE);
   alpha=0.95, minSup=4, tpEval=$6, selFeat=$7, verbose=$8, encodeLat = FALSE);
 
 [TK1, TKC1, D1, L1, Stats1, Xout1, eOut1, foffb2, foffe2, nColOneHotX2, params] = incSliceLine(addedX=addedX, oldX = oldX, oldE = oldE, addedE=addedE, prevLattice = L, prevStats = Stats, prevTK = TK, prevTKC = TKC, k=$5,
-  alpha=0.95, minSup=4, tpEval=$6, selFeat=$7, verbose=$8, params=params, prevFoffb = foffb, prevFoffe = foffe, nColPrevOneHotX = nColOneHotX, encodeLat = FALSE);
+  alpha=0.95, minSup=4, tpEval=$6, selFeat=$7, verbose=$8, params=params, prevFoffb = foffb, prevFoffe = foffe, prevNColOneHotX = nColOneHotX, encodeLat = FALSE);
 
 [TK2, TKC2, D2, L2, Stats2, Xout2, eOut2, foffb3, foffe3, nColOneHotX3, params] = incSliceLine(addedX=totalX, addedE=totalE, k=$5,
   alpha=0.95, minSup=4, tpEval=$6, selFeat=$7, verbose=$8, encodeLat = FALSE);