Merge pull request #10 from open-space-collective/dev@lucas

Dev@lucas
open-space-collective · Sep 3, 2018 · 50cf3d3 · 50cf3d3
2 parents 219e962 + 633812f
commit 50cf3d3
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/Library/Mathematics/Geometry/2D/Object.cpp b/src/Library/Mathematics/Geometry/2D/Object.cpp
@@ -38,7 +38,7 @@ bool                            Object::operator ==                         (
     using library::math::geom::d2::objects::Point ;
     using library::math::geom::d2::objects::Polygon ;
 
-    if ((!this->isDefined()) && (!anObject.isDefined()))
+    if ((!this->isDefined()) || (!anObject.isDefined()))
     {
         return false ;
     }

diff --git a/src/Library/Mathematics/Geometry/2D/Objects/Point.cpp b/src/Library/Mathematics/Geometry/2D/Objects/Point.cpp
@@ -51,7 +51,7 @@ Point*                          Point::clone                                ( )
 bool                            Point::operator ==                          (   const   Point&                      aPoint                                      ) const
 {
 
-    if ((!this->isDefined()) && (!aPoint.isDefined()))
+    if ((!this->isDefined()) || (!aPoint.isDefined()))
     {
         return false ;
     }

diff --git a/src/Library/Mathematics/Geometry/2D/Objects/Polygon.cpp b/src/Library/Mathematics/Geometry/2D/Objects/Polygon.cpp
@@ -442,7 +442,7 @@ Polygon*                        Polygon::clone                              ( )
 bool                            Polygon::operator ==                        (   const   Polygon&                    aPolygon                                    ) const
 {
 
-    if ((!this->isDefined()) && (!aPolygon.isDefined()))
+    if ((!this->isDefined()) || (!aPolygon.isDefined()))
     {
         return false ;
     }

diff --git a/src/Library/Mathematics/Geometry/3D/Object.cpp b/src/Library/Mathematics/Geometry/3D/Object.cpp
@@ -53,7 +53,7 @@ bool                            Object::operator ==                         (
     using library::math::geom::d3::objects::Ellipsoid ;
     using library::math::geom::d3::objects::Pyramid ;
 
-    if ((!this->isDefined()) && (!anObject.isDefined()))
+    if ((!this->isDefined()) || (!anObject.isDefined()))
     {
         return false ;
     }

diff --git a/src/Library/Mathematics/Geometry/3D/Objects/Point.cpp b/src/Library/Mathematics/Geometry/3D/Objects/Point.cpp
@@ -52,7 +52,7 @@ Point*                          Point::clone                                ( )
 bool                            Point::operator ==                          (   const   Point&                      aPoint                                      ) const
 {
 
-    if ((!this->isDefined()) && (!aPoint.isDefined()))
+    if ((!this->isDefined()) || (!aPoint.isDefined()))
     {
         return false ;
     }

diff --git a/tools/.env b/tools/.env
@@ -38,7 +38,7 @@ fi
 
 repository_name="openspacecollective"
 # image_version="$(echo ${version} | head -c 5)"
-image_version="0.1.8"
+image_version="0.1.9"
 
 image_name="${repository_name}/${project_name}:${image_version}"
 

diff --git a/tools/development/docker/Dockerfile b/tools/development/docker/Dockerfile
@@ -61,12 +61,12 @@ RUN mkdir /tmp/geometric-tools-engine \
  && rm -rf /tmp/geometric-tools-engine \
  && popd > /dev/null
 
-## Library :: Core [0.1.11]
+## Library :: Core [0.1.12]
 
 RUN mkdir -p /tmp/library-core \
  && pushd /tmp/library-core > /dev/null \
- && wget --quiet https://github.com/open-space-collective/library-core/releases/download/0.1.11/library-core-0.1.11-1.x86_64-runtime.rpm \
- && wget --quiet https://github.com/open-space-collective/library-core/releases/download/0.1.11/library-core-0.1.11-1.x86_64-devel.rpm \
+ && wget --quiet https://github.com/open-space-collective/library-core/releases/download/0.1.12/library-core-0.1.12-1.x86_64-runtime.rpm \
+ && wget --quiet https://github.com/open-space-collective/library-core/releases/download/0.1.12/library-core-0.1.12-1.x86_64-devel.rpm \
  && dnf install -y ./*.rpm \
  && rm -rf /tmp/library-core \
  && popd > /dev/null