Merge pull request #41 from Eve-ning/fix-bad-na-value-issue

Fix bad NA value Issue

docs/_sources/changelog.md.txt

@@ -22,7 +22,7 @@
     - Reduces duplicate code for handling NumPy and CuPy arrays conditionally.
 - [Merged PR 36](https://github.com/Eve-ning/glcm-cupy/pull/36)
     - Implement NaN Handling by ignoring contribution to GLCM
-  
+
 ## 1.9
 
 - [Merged PR 10](https://github.com/Eve-ning/glcm-cupy/pull/10)
@@ -40,6 +40,9 @@
     - Fix `test_from_2d_image` failing due to missing 3rd dimension
     - Remove `test_image_tiff` as it's redundant
     - Fix reference `GLCM._binner` to `binner` in `utils`
+- [Merged PR 41](https://github.com/Eve-ning/glcm-cupy/pull/41)
+    - Resolved issue where NA replacement value was incorrectly set to `bin_from`
+    - Resolved issue where NA summing used `.sum` instead of `np.nansum`
 
 ## 1.8
 

docs/changelog.html

@@ -248,6 +248,12 @@ <h2>1.9<a class="headerlink" href="#id2" title="Permalink to this heading">¶</a
 <li><p>Fix reference <code class="docutils literal notranslate"><span class="pre">GLCM._binner</span></code> to <code class="docutils literal notranslate"><span class="pre">binner</span></code> in <code class="docutils literal notranslate"><span class="pre">utils</span></code></p></li>
 </ul>
 </li>
+<li><p><a class="reference external" href="https://github.com/Eve-ning/glcm-cupy/pull/41">Merged PR 41</a></p>
+<ul>
+<li><p>Resolved issue where NA replacement value was incorrectly set to <code class="docutils literal notranslate"><span class="pre">bin_from</span></code></p></li>
+<li><p>Resolved issue where NA summing used <code class="docutils literal notranslate"><span class="pre">.sum</span></code> instead of <code class="docutils literal notranslate"><span class="pre">np.nansum</span></code></p></li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="id3">

glcm_cupy/glcm_base.py

@@ -121,7 +121,7 @@ def glcm_cells(self, im: cp.ndarray) -> float:
     @property
     def nan_replacement(self):
         """ Replacement Value for NaN """
-        return self.bin_from
+        return self.bin_to
 
     def run(self, im: ndarray):
         """ Executes running GLCM. Returns the GLCM Feature array
@@ -340,8 +340,8 @@ def glcm_ij(self,
                   self.ar_features,
                   True)
         )
-        self.ar_glcm /= self.ar_glcm.sum(
-            axis=(1, 2)
+        self.ar_glcm /= np.nansum(
+            self.ar_glcm, axis=(1, 2)
         )[..., np.newaxis, np.newaxis]
         if self.do_stage(0): self.glcm_feature_kernel_0(**feature_args)
         if self.do_stage(1): self.glcm_feature_kernel_1(**feature_args)

sphinx/build/html/_sources/changelog.md.txt

@@ -22,7 +22,7 @@
     - Reduces duplicate code for handling NumPy and CuPy arrays conditionally.
 - [Merged PR 36](https://github.com/Eve-ning/glcm-cupy/pull/36)
     - Implement NaN Handling by ignoring contribution to GLCM
-  
+
 ## 1.9
 
 - [Merged PR 10](https://github.com/Eve-ning/glcm-cupy/pull/10)
@@ -40,6 +40,9 @@
     - Fix `test_from_2d_image` failing due to missing 3rd dimension
     - Remove `test_image_tiff` as it's redundant
     - Fix reference `GLCM._binner` to `binner` in `utils`
+- [Merged PR 41](https://github.com/Eve-ning/glcm-cupy/pull/41)
+    - Resolved issue where NA replacement value was incorrectly set to `bin_from`
+    - Resolved issue where NA summing used `.sum` instead of `np.nansum`
 
 ## 1.8
 

sphinx/build/html/changelog.html

@@ -248,6 +248,12 @@ <h2>1.9<a class="headerlink" href="#id2" title="Permalink to this heading">¶</a
 <li><p>Fix reference <code class="docutils literal notranslate"><span class="pre">GLCM._binner</span></code> to <code class="docutils literal notranslate"><span class="pre">binner</span></code> in <code class="docutils literal notranslate"><span class="pre">utils</span></code></p></li>
 </ul>
 </li>
+<li><p><a class="reference external" href="https://github.com/Eve-ning/glcm-cupy/pull/41">Merged PR 41</a></p>
+<ul>
+<li><p>Resolved issue where NA replacement value was incorrectly set to <code class="docutils literal notranslate"><span class="pre">bin_from</span></code></p></li>
+<li><p>Resolved issue where NA summing used <code class="docutils literal notranslate"><span class="pre">.sum</span></code> instead of <code class="docutils literal notranslate"><span class="pre">np.nansum</span></code></p></li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="id3">

sphinx/src/changelog.md

@@ -22,7 +22,7 @@
     - Reduces duplicate code for handling NumPy and CuPy arrays conditionally.
 - [Merged PR 36](https://github.com/Eve-ning/glcm-cupy/pull/36)
     - Implement NaN Handling by ignoring contribution to GLCM
-  
+
 ## 1.9
 
 - [Merged PR 10](https://github.com/Eve-ning/glcm-cupy/pull/10)
@@ -40,6 +40,9 @@
     - Fix `test_from_2d_image` failing due to missing 3rd dimension
     - Remove `test_image_tiff` as it's redundant
     - Fix reference `GLCM._binner` to `binner` in `utils`
+- [Merged PR 41](https://github.com/Eve-ning/glcm-cupy/pull/41)
+    - Resolved issue where NA replacement value was incorrectly set to `bin_from`
+    - Resolved issue where NA summing used `.sum` instead of `np.nansum`
 
 ## 1.8
 

tests/integration_tests/test_padding.py

@@ -56,10 +56,3 @@ def test_signature_match():
     fn = dict(inspect.signature(glcm).parameters)
     del fn['im']
     assert cls == fn
-
-def test_padding():
-    """ Tests if class & function signatures match """
-    cls = dict(inspect.signature(GLCM).parameters)
-    fn = dict(inspect.signature(glcm).parameters)
-    del fn['im']
-    assert cls == fn