Mask cleanup.

Author: gsvgit

cfpq_matrix/block/block_matrix.py

@@ -25,8 +25,6 @@ def optimize_similarly(self, other: Matrix) -> "OptimizedMatrix":
 
     def to_mask(self):
         if self.block_matrix_space.is_single_cell(self.shape):
-            print ("@@@@@@@")
-            print (self.shape)
             return self.base.to_mask()
         else:
             return None

cfpq_matrix/format_optimized_matrix.py

@@ -31,8 +31,6 @@ def base(self) -> OptimizedMatrix:
         return self._base
 
     def to_mask(self) -> Matrix:
-        print ("#####")
-        #print (self.matrices[0].to_mask())
         return list(self.matrices.values())[0].to_mask()
 
     def _force_init_format(self, desired_format: str) -> OptimizedMatrix:

cfpq_matrix/lazy_add_optimized_matrix.py

@@ -24,7 +24,7 @@ def nvals(self) -> int:
         return sum(m.nvals for m in self.matrices)
 
     def to_mask(self) -> Matrix:
-        return self.matrices[0].to_mask()
+        return (max(self.matrices, key = lambda m: m.nvals)).to_mask()
 
     def _map_and_fold(
             self,

cfpq_matrix/matrix_to_optimized_adapter.py

@@ -39,21 +39,16 @@ def to_unoptimized(self) -> Matrix:
     def mxm(self, other: Matrix, op: Semiring, mask: Matrix, swap_operands: bool = False) -> Matrix:
         if swap_operands:
             if not mask is None:
-                #print("It would be nice to apply mask in swap operands") 
                 print("Mask applied, swap operands.")
                 result = Matrix(self.dtype,nrows=other.shape[0],ncols=self.shape[1])
-                #mask_t = Matrix(mask.dtype, ncols=mask.ncols, nrows=mask.nrows)
-                #mask_t << mask.T 
-                #result(~mask) << other.mxm(self.base, op)
-                result(~mask) << other.mxm(self.base, op).new(self.dtype)
+                result(~mask.S) << other.mxm(self.base, op).new(self.dtype)
                 return result
-                #return other.mxm(self.base, op).new(self.dtype)
             else: return other.mxm(self.base, op).new(self.dtype)
         else:
             if not mask is None:
                 print("Mask applied.")
                 result = Matrix(self.dtype,nrows=self.shape[0],ncols=other.shape[1])
-                result(~mask) << self.base.mxm(other, op).new(self.dtype)
+                result(~mask.S) << self.base.mxm(other, op).new(self.dtype)
                 return result
             else: return self.base.mxm(other, op).new(self.dtype)