modified: setup.py

modified: spfeas/__init__.py modified: spfeas/files/INSTALL_Windows.cmd new file: spfeas/files/INSTALL_Windows_x64.cmd modified: spfeas/helpers/_moving_window.pyd modified: spfeas/notebooks/INSTALLATION.ipynb modified: spfeas/sphelpers/_chunk.pyd modified: spfeas/sphelpers/_stats.pyd modified: spfeas/sphelpers/_stats.pyx
jgrss · Jan 3, 2017 · 056d37f · 056d37f
1 parent fefecdd
commit 056d37f
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 16 deletions.
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@
 import platform
 
 
-__version__ = '0.0.4b'
+__version__ = '0.0.3'
 
 spfeas_name = 'SpFeas'
 maintainer = 'Jordan Graesser'

diff --git a/spfeas/__init__.py b/spfeas/__init__.py
@@ -1 +1 @@
-__version__ = '0.0.4b'
+__version__ = '0.0.3'
diff --git a/spfeas/files/INSTALL_Windows.cmd b/spfeas/files/INSTALL_Windows.cmd
@@ -4,7 +4,7 @@ where /q pip
 IF NOT ERRORLEVEL 1 (
 
     REM Install compiled wheels that do not pip install
-    pip install --no-cache-dir numpy-1.11.2+mkl-cp27-cp27m-win32.whl numexpr-2.6.1-cp27-cp27m-win32.whl scikit_image-0.12.3-cp27-cp27m-win32.whl scipy-0.18.1-cp27-cp27m-win32.whl tables-3.3.0-cp27-cp27m-win32.whl Bottleneck-1.2.0-cp27-cp27m-win32.whl GDAL‑2.1.2‑cp27‑cp27m‑win32.whl statsmodels-0.8.0rc1-cp27-cp27m-win32.whl
+    pip install --no-cache-dir numpy‑1.12.0rc2+mkl‑cp27‑cp27m‑win32.whl numexpr-2.6.1-cp27-cp27m-win32.whl scikit_image-0.12.3-cp27-cp27m-win32.whl scipy-0.18.1-cp27-cp27m-win32.whl tables-3.3.0-cp27-cp27m-win32.whl Bottleneck-1.2.0-cp27-cp27m-win32.whl GDAL‑2.1.2‑cp27‑cp27m‑win32.whl statsmodels-0.8.0rc1-cp27-cp27m-win32.whl
 
     pip install --no-cache-dir beautifulsoup4 retrying six xmltodict colorama cython joblib matplotlib opencv-python pandas psutil PySAL PyYAML scikit-learn 
 
@@ -18,7 +18,7 @@ IF NOT ERRORLEVEL 1 (
     IF NOT ERRORLEVEL 1 (
         pip install git+https://github.com/jgrss/mpglue.git
     ) ELSE (
-        pip install MpGlue-0.0.1.tar.gz
+        pip install MpGlue-0.0.5.tar.gz
     )
 
     REM Uninstall SpFeas if it already exists
@@ -31,7 +31,7 @@ IF NOT ERRORLEVEL 1 (
     IF NOT ERRORLEVEL 1 (
         pip install git+https://github.com/jgrss/spfeas.git     
     ) ELSE (
-        pip install SpFeas-0.0.1.tar.gz
+        pip install SpFeas-0.0.3.tar.gz
     )
 
     REM Check if SpFeas installed correctly

diff --git a/spfeas/files/INSTALL_Windows_x64.cmd b/spfeas/files/INSTALL_Windows_x64.cmd
@@ -0,0 +1,47 @@
+REM pip needs to be installed
+where /q pip
+
+IF NOT ERRORLEVEL 1 (
+
+    REM Install compiled wheels that do not pip install
+    pip install --no-cache-dir numpy‑1.12.0rc2+mkl‑cp27‑cp27m‑win_amd64.whl numexpr‑2.6.1‑cp27‑cp27m‑win_amd64.whl scikit_image‑0.12.3‑cp27‑cp27m‑win_amd64.whl scipy‑0.18.1‑cp27‑cp27m‑win_amd64.whl tables‑3.3.0‑cp27‑cp27m‑win_amd64.whl Bottleneck‑1.2.0‑cp27‑cp27m‑win_amd64.whl GDAL‑2.1.2‑cp27‑cp27m‑win_amd64.whl statsmodels‑0.8.0rc1‑cp27‑cp27m‑win_amd64.whl
+
+    pip install --no-cache-dir beautifulsoup4 retrying six xmltodict colorama cython joblib matplotlib opencv-python pandas psutil PySAL PyYAML scikit-learn 
+
+    REM Uninstall MpGlue if it already exists 
+    where /q classify
+    IF NOT ERRORLEVEL 1 (
+        pip uninstall mpglue
+      )
+
+    where /q git
+    IF NOT ERRORLEVEL 1 (
+        pip install git+https://github.com/jgrss/mpglue.git
+    ) ELSE (
+        pip install MpGlue-0.0.5.tar.gz
+    )
+
+    REM Uninstall SpFeas if it already exists
+    where /q spfeas
+    IF NOT ERRORLEVEL 1 (
+        pip uninstall spfeas
+      ) 
+
+    where /q git
+    IF NOT ERRORLEVEL 1 (
+        pip install git+https://github.com/jgrss/spfeas.git     
+    ) ELSE (
+        pip install SpFeas-0.0.3-x64.tar.gz
+    )
+
+    REM Check if SpFeas installed correctly
+    where /q spfeas
+    IF NOT ERRORLEVEL 1 (
+        ECHO.The installation has finished!
+      ) ELSE (
+        ECHO.SpFeas failed to install.
+      )
+
+  ) ELSE (
+    ECHO.Download get-pip.py from https://pip.pypa.io/en/latest/installing/
+  )
diff --git a/spfeas/helpers/_moving_window.pyd b/spfeas/helpers/_moving_window.pyd
diff --git a/spfeas/notebooks/INSTALLATION.ipynb b/spfeas/notebooks/INSTALLATION.ipynb
@@ -77,21 +77,21 @@
     "\n",
     "1. Download the following wheel files from [Gohlke's site](http://www.lfd.uci.edu/~gohlke/pythonlibs/) and save them to C:\\Downloads.\n",
     "\n",
-    "    > numpy-1.11.2+mkl-cp27-cp27m-win32.whl \n",
+    "    > numpy‑1.12.0rc2+mkl‑cp27‑cp27m‑win32.whl or numpy‑1.12.0rc2+mkl‑cp27‑cp27m‑win_amd64.whl \n",
     "    \n",
-    "    > Bottleneck-1.2.0-cp27-cp27m-win32.whl\n",
+    "    > Bottleneck-1.2.0-cp27-cp27m-win32.whl or Bottleneck‑1.2.0‑cp27‑cp27m‑win_amd64.whl\n",
     "    \n",
-    "    > numexpr-2.6.1-cp27-cp27m-win32.whl \n",
+    "    > numexpr-2.6.1-cp27-cp27m-win32.whl or numexpr‑2.6.1‑cp27‑cp27m‑win_amd64.whl\n",
     "    \n",
-    "    > scikit_image-0.12.3-cp27-cp27m-win32.whl \n",
+    "    > scikit_image-0.12.3-cp27-cp27m-win32.whl or scikit_image‑0.12.3‑cp27‑cp27m‑win_amd64.whl\n",
     "    \n",
-    "    > scipy-0.18.1-cp27-cp27m-win32.whl \n",
+    "    > scipy-0.18.1-cp27-cp27m-win32.whl or scipy‑0.18.1‑cp27‑cp27m‑win_amd64.whl\n",
     "    \n",
-    "    > tables-3.3.0-cp27-cp27m-win32.whl    \n",
+    "    > tables-3.3.0-cp27-cp27m-win32.whl or tables‑3.3.0‑cp27‑cp27m‑win_amd64.whl  \n",
     "    \n",
-    "    > statsmodels-0.8.0rc1-cp27-cp27m-win32.whl\n",
+    "    > statsmodels-0.8.0rc1-cp27-cp27m-win32.whl or statsmodels‑0.8.0rc1‑cp27‑cp27m‑win_amd64.whl\n",
     "    \n",
-    "    > GDAL‑2.1.2‑cp27‑cp27m‑win32.whl\n",
+    "    > GDAL‑2.1.2‑cp27‑cp27m‑win32.whl or GDAL‑2.1.2‑cp27‑cp27m‑win_amd64.whl\n",
     "        \n",
     "2. Either download [git for Windows](https://www.atlassian.com/git/tutorials/install-git/mac-os-x) **OR** download the [MpGlue](https://github.com/jgrss/mpglue/releases) and [SpFeas](https://github.com/jgrss/spfeas/releases) tarballs. \n",
     "    * If you choose to download and configure **git**, then you DO NOT need to download the MpGlue and SpFeas tarballs.\n",
@@ -136,7 +136,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.12"
+   "version": "2.7.13"
   }
  },
  "nbformat": 4,

diff --git a/spfeas/sphelpers/_chunk.pyd b/spfeas/sphelpers/_chunk.pyd
diff --git a/spfeas/sphelpers/_stats.pyd b/spfeas/sphelpers/_stats.pyd
diff --git a/spfeas/sphelpers/_stats.pyx b/spfeas/sphelpers/_stats.pyx
@@ -1652,8 +1652,11 @@ cdef _glcm_loop(DTYPE_uint8_t[:, :] image, DTYPE_float32_t[:] distances,
                     i = image[r, c]
 
                     # compute the location of the offset pixel
-                    row = r + <int>round(sin(angle) * distance)
-                    col = c + <int>round(cos(angle) * distance)
+                    # row = r + <int>round(sin(angle) * distance)
+                    # col = c + <int>round(cos(angle) * distance)
+
+                    row = r + int(round(sin(angle) * distance))
+                    col = c + int(round(cos(angle) * distance))
 
                     # row = r + int(round(sin(angle) * distance))
                     # col = c + int(round(cos(angle) * distance))