Fixed float/int mismatch when generating windows

the-lay · Jan 6, 2022 · 555698f · 555698f
1 parent 7d75102
commit 555698f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -2059,7 +2059,7 @@ <h6 id="return">Return</h6>
                 <span class="k">else</span><span class="p">:</span>
                     <span class="n">win</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">stack</span><span class="p">([</span><span class="n">win</span><span class="p">]</span> <span class="o">*</span> <span class="n">shape</span><span class="p">[</span><span class="n">i</span><span class="p">],</span> <span class="n">axis</span><span class="o">=</span><span class="n">i</span><span class="p">)</span>
 
-            <span class="n">w</span> <span class="o">*=</span> <span class="n">win</span>
+            <span class="n">w</span> <span class="o">*=</span> <span class="n">win</span><span class="o">.</span><span class="n">astype</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">weights_dtype</span><span class="p">)</span>
 
         <span class="k">return</span> <span class="n">w</span>
 

diff --git a/tests/test_merger.py b/tests/test_merger.py
@@ -32,14 +32,14 @@ def test_init(self):
         merger4 = Merger(
             tiler=tiler,
             data_dtype=np.float32,
-            weights_dtype=np.float32,
+            weights_dtype=np.int16,
             window="boxcar",
         )
         self.assertEqual(merger4.data.dtype, np.float32)
         self.assertEqual(merger4.data_dtype, np.float32)
-        self.assertEqual(merger4.weights_sum.dtype, np.float32)
-        self.assertEqual(merger4.weights_dtype, np.float32)
-        self.assertEqual(merger4.window.dtype, np.float32)
+        self.assertEqual(merger4.weights_sum.dtype, np.int16)
+        self.assertEqual(merger4.weights_dtype, np.int16)
+        self.assertEqual(merger4.window.dtype, np.int16)
 
     def test_add(self):
         tiler = Tiler(data_shape=self.data.shape, tile_shape=(10,))

diff --git a/tiler/merger.py b/tiler/merger.py
@@ -153,7 +153,7 @@ def _generate_window(self, window: str, shape: Union[Tuple, List]) -> np.ndarray
                 else:
                     win = np.stack([win] * shape[i], axis=i)
 
-            w *= win
+            w *= win.astype(self.weights_dtype)
 
         return w