1. 18 Jul, 2016 2 commits
    • mjg226's avatar
      Merge branch 'master' of https://git.exeter.ac.uk/caddies/caddies-api · 6af9f248
      mjg226 authored
      # Conflicts:
      #	impls/common/CPU/Functions.hpp
      #	impls/common/CPU/Options.hpp
      #	impls/square-cell/vn-neighbours/1-levels/openmp/Functions.hpp
      #	impls/square-cell/vn-neighbours/1-levels/openmp/Options.hpp
      #	impls/square-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp
      #	impls/square-cell/vn-neighbours/1-levels/simple/Functions.hpp
      #	impls/square-cell/vn-neighbours/1-levels/simple/Options.hpp
      
      updated cmake, and merging.
      6af9f248
    • mjg226's avatar
      Removed the last few static variables from openCL square implementation, note:... · 7356b5f1
      mjg226 authored
      Removed the last few static variables from openCL square implementation, note: this makes the cpp files redundent and should be removed later.
      7356b5f1
  2. 14 Jul, 2016 1 commit
  3. 13 Jul, 2016 1 commit
    • mjg226's avatar
      Debugged for windows compilation. · 7c31be67
      mjg226 authored
      - added default constructor to CA::Point class, as MSVC complained.
      - add two functions to the HexAsciiGrid class, as these are needed by DLL or comparison program, not fully implemented yet
          void addAsciiGrid(AsciiGrid<T>& grid2, bool print = false); which adds the data of one grid into another using geo-cordinates
          Errors compareAsciiGrid(AsciiGrid<T>& grid2, T tolerance = 0.0, bool print = false); which compares the difference between two grids, likey this will be the same as for square grids.
      - minor debug of mapping real value to arrays of length two, for some reason MSVC didn't like this so replaced with Points which hold the two values.
      7c31be67
  4. 13 May, 2016 1 commit
  5. 11 May, 2016 1 commit
  6. 10 May, 2016 1 commit
  7. 04 May, 2016 1 commit
    • Luís de Sousa's avatar
      Hexagon specific endca2D.hpp · c98af9cf
      Luís de Sousa authored
      This file is in the common package, but assumes the grid to always
      regular and squared. Also added distance function to Coo class and
      method in Grid class to retrieve the distance between hexagon centroids.
      c98af9cf
  8. 28 Apr, 2016 2 commits
  9. 27 Apr, 2016 1 commit
    • mjg226's avatar
      Removed Functions and Options file from common folder, as they are differet... · 8698635a
      mjg226 authored
      Removed Functions and Options file from common folder, as they are differet for simple,OpenMP and OpenCL.
      Could create a seaparte common folder for CPU/GPU implementation difference later.
      Corrected the hexagonal and square simple and openm implementations.
      Also corrected bug in ESRI_ASCIIGrid.hpp
      8698635a
  10. 30 Mar, 2016 3 commits
  11. 24 Mar, 2016 7 commits
  12. 23 Mar, 2016 1 commit
  13. 22 Mar, 2016 2 commits
  14. 21 Mar, 2016 1 commit
  15. 18 Mar, 2016 2 commits
  16. 10 Mar, 2016 1 commit
  17. 09 Mar, 2016 1 commit
  18. 21 Feb, 2016 1 commit
  19. 18 Feb, 2016 1 commit
  20. 11 Feb, 2016 1 commit
  21. 10 Feb, 2016 2 commits
  22. 08 Feb, 2016 2 commits
  23. 28 Jan, 2016 4 commits