GitLab

updated defintions to utilise openCL version number and not just check for 1.1 or 1.2, but version number atleast 1.1
updated version number of API due to change.

added simple upscaling to CellBuff

Updated version to 120 for API, due to the conflicts with previous version, with the abstraction of the ascii grid to be implementation specific

fixed the decimal precision output to fixed decimals as claimed instead of significant figures

updated logic in boxlist::add for when a box is completely within another

Grid will now set default settings if the confile file is lacking, instead of bailing out.

# 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.

Removed the last few static variables from openCL square implementation, note: this makes the cpp files redundent and should be removed later.

- 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.

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.

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