updated hash and eq methods for point and cleaned unix build script

Signed-off-by: Debasish Kanhar <[email protected]>

build.sh

@@ -53,14 +53,6 @@ if [ -z "${PYTHON_PATH+x}" ]; then
   fi
 fi
 
-#if command -v python3 --version &>/dev/null; then
-#  echo "Pre-requisite Python already installed. 'python3' command works"
-#else
-#  echo "Pre-requisite python isn't installed on system. \
-#        Please check and make sure that 'python3' command works in shell"
-#  exit 1
-#fi
-
 if command -v virtualenv --version &>/dev/null; then
   echo "Pre-requisite virtualenv already installed."
 else
@@ -71,17 +63,6 @@ fi
 echo "Creating virtualenv with -p=${PYTHON_PATH}"
 virtualenv -p "${PYTHON_PATH}" "${ENV_NAME}"
 
-# Create virtualenv now
-#if [ -z "${PYTHON_PATH+x}" ]; then
-#  # When -p parameter is not provided
-#  echo "Creating virtualenv with -p python3"
-#  virtualenv -p python3 "${ENV_NAME}"
-#else
-#  # When -p parameter for Python Path is provided.
-#  echo "Creating virtualenv with -p=${PYTHON_PATH}"
-#  virtualenv -p "${PYTHON_PATH}" "${ENV_NAME}"
-#fi
-
 chmod +x before-script.sh
 ./before-script.sh "${ENV_NAME}"
 

src/main/python/janusgraph_python/core/datatypes/Point.py

@@ -71,6 +71,9 @@ def __are_coordinates_valid(self):
 
         return abs(self.getLatitude()) <= 90.0 and abs(self.getLongitude()) <= 180.0
 
+    def __key(self):
+        return tuple(self.getCoordinates())
+
     def __eq__(self, other):
         """
             Overrides the default class equality method.
@@ -82,14 +85,10 @@ def __eq__(self, other):
             bool
         """
 
-        if type(other) is Point:
-            return (other.getLatitude().__eq__(self.getLatitude())) and \
-                   (other.getLongitude().__eq__(self.getLongitude()))
-
-        return False
+        return isinstance(self, type(other)) and self.__key() == other.__key()
 
     def __hash__(self):
-        return hash(self.getLatitude()) ^ hash(self.getLongitude())
+        return hash(self.__key())
 
     def __str__(self):
         return "POINT(lat: {}, lon: {})".format(self.getLatitude(), self.getLongitude())