Fix typo error (djikstra -> dijkstra)

Fix typo error of algorithm name

Change-Id: I888f543005ea07ff446d04ffd941325e52ed0551
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>

diff --git a/automated-tests/src/dali-scene3d/utc-Dali-PathFinding.cpp b/automated-tests/src/dali-scene3d/utc-Dali-PathFinding.cpp
index b0cfeb4..d924c3a 100644 (file)
--- a/automated-tests/src/dali-scene3d/utc-Dali-PathFinding.cpp
+++ b/automated-tests/src/dali-scene3d/utc-Dali-PathFinding.cpp
@@ -109,7 +109,7 @@ int UtcDaliPathFinderFindShortestPath0(void)
   auto navmesh = NavigationMeshFactory::CreateFromFile("resources/navmesh-test.bin");
 
   std::vector<PathFinderAlgorithm> testAlgorithms = {
-    PathFinderAlgorithm::DJIKSTRA_SHORTEST_PATH,
+    PathFinderAlgorithm::DIJKSTRA_SHORTEST_PATH,
     PathFinderAlgorithm::SPFA,
   };
 
@@ -159,7 +159,7 @@ int UtcDaliPathFinderFindShortestPath1(void)
   navmesh->SetSceneTransform(Matrix(Matrix::IDENTITY));
 
   std::vector<PathFinderAlgorithm> testAlgorithms = {
-    PathFinderAlgorithm::DJIKSTRA_SHORTEST_PATH,
+    PathFinderAlgorithm::DIJKSTRA_SHORTEST_PATH,
     PathFinderAlgorithm::SPFA,
     PathFinderAlgorithm::SPFA_DOUBLE_WAY, /* Note : Even this algorithm doesn't found shortest path, UTC will pass. */
   };

diff --git a/dali-scene3d/internal/algorithm/path-finder-djikstra.cpp b/dali-scene3d/internal/algorithm/path-finder-dijkstra.cpp
similarity index 95%
rename from dali-scene3d/internal/algorithm/path-finder-djikstra.cpp
rename to dali-scene3d/internal/algorithm/path-finder-dijkstra.cpp
index 70aeb2c..ad64b96 100644 (file)
--- a/dali-scene3d/internal/algorithm/path-finder-djikstra.cpp
+++ b/dali-scene3d/internal/algorithm/path-finder-dijkstra.cpp
@@ -15,7 +15,7 @@
  */
 
 // CLASS HEADER
-#include <dali-scene3d/internal/algorithm/path-finder-djikstra.h>
+#include <dali-scene3d/internal/algorithm/path-finder-dijkstra.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
@@ -52,15 +52,15 @@ struct DijkstraComparer
 
 namespace Dali::Scene3D::Internal::Algorithm
 {
-PathFinderAlgorithmDjikstra::PathFinderAlgorithmDjikstra(Dali::Scene3D::Algorithm::NavigationMesh& navMesh)
+PathFinderAlgorithmDijkstra::PathFinderAlgorithmDijkstra(Dali::Scene3D::Algorithm::NavigationMesh& navMesh)
 : mNavigationMesh(&GetImplementation(navMesh))
 {
   PrepareData();
 }
 
-PathFinderAlgorithmDjikstra::~PathFinderAlgorithmDjikstra() = default;
+PathFinderAlgorithmDijkstra::~PathFinderAlgorithmDijkstra() = default;
 
-Scene3D::Algorithm::WayPointList PathFinderAlgorithmDjikstra::FindPath(const Dali::Vector3& positionFrom, const Dali::Vector3& positionTo)
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmDijkstra::FindPath(const Dali::Vector3& positionFrom, const Dali::Vector3& positionTo)
 {
   Dali::Vector3 outPosFrom;
   FaceIndex     polyIndexFrom;
@@ -100,7 +100,7 @@ Scene3D::Algorithm::WayPointList PathFinderAlgorithmDjikstra::FindPath(const Dal
   return waypoints;
 }
 
-Scene3D::Algorithm::WayPointList PathFinderAlgorithmDjikstra::FindPath(FaceIndex sourcePolyIndex, FaceIndex targetPolyIndex)
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmDijkstra::FindPath(FaceIndex sourcePolyIndex, FaceIndex targetPolyIndex)
 {
   auto                   nodeCount = uint32_t(mNodes.size());
   std::vector<float>     dist;
@@ -218,7 +218,7 @@ Scene3D::Algorithm::WayPointList PathFinderAlgorithmDjikstra::FindPath(FaceIndex
   return OptimizeWaypoints(waypoints);
 }
 
-void PathFinderAlgorithmDjikstra::PrepareData()
+void PathFinderAlgorithmDijkstra::PrepareData()
 {
   // Build the list structure connecting the nodes
   auto faceCount = mNavigationMesh->GetFaceCount();
@@ -263,7 +263,7 @@ void PathFinderAlgorithmDjikstra::PrepareData()
   return ccw(A, C, D) != ccw(B, C, D) && ccw(A, B, C) != ccw(A, B, D);
 }
 
-Scene3D::Algorithm::WayPointList PathFinderAlgorithmDjikstra::OptimizeWaypoints(WayPointList& waypoints) const
+Scene3D::Algorithm::WayPointList PathFinderAlgorithmDijkstra::OptimizeWaypoints(WayPointList& waypoints) const
 {
   WayPointList optimizedWaypoints;
   optimizedWaypoints.emplace_back(waypoints[0]);

diff --git a/dali-scene3d/internal/algorithm/path-finder-djikstra.h b/dali-scene3d/internal/algorithm/path-finder-dijkstra.h
similarity index 88%
rename from dali-scene3d/internal/algorithm/path-finder-djikstra.h
rename to dali-scene3d/internal/algorithm/path-finder-dijkstra.h
index 08a6cee..237b1c9 100644 (file)
--- a/dali-scene3d/internal/algorithm/path-finder-djikstra.h
+++ b/dali-scene3d/internal/algorithm/path-finder-dijkstra.h
@@ -1,5 +1,5 @@
-#ifndef DALI_SCENE3D_INTERNAL_PATH_FINDER_DJIKSTRA_H
-#define DALI_SCENE3D_INTERNAL_PATH_FINDER_DJIKSTRA_H
+#ifndef DALI_SCENE3D_INTERNAL_PATH_FINDER_DIJKSTRA_H
+#define DALI_SCENE3D_INTERNAL_PATH_FINDER_DIJKSTRA_H
 
 /*
  * Copyright (c) 2023 Samsung Electronics Co., Ltd.
@@ -23,7 +23,7 @@
 
 namespace Dali::Scene3D::Internal::Algorithm
 {
-class PathFinderAlgorithmDjikstra : public Dali::Scene3D::Algorithm::PathFinderBase
+class PathFinderAlgorithmDijkstra : public Dali::Scene3D::Algorithm::PathFinderBase
 {
 public:
   /**
@@ -31,12 +31,12 @@ public:
    *
    * @param[in] navMesh Navigation mesh to associate with the algorithm
    */
-  explicit PathFinderAlgorithmDjikstra(Dali::Scene3D::Algorithm::NavigationMesh& navMesh);
+  explicit PathFinderAlgorithmDijkstra(Dali::Scene3D::Algorithm::NavigationMesh& navMesh);
 
   /**
    * @brief Destructor
    */
-  ~PathFinderAlgorithmDjikstra() override;
+  ~PathFinderAlgorithmDijkstra() override;
 
   /**
    * @brief Looks for a path from point A to point B.
@@ -85,4 +85,4 @@ public:
   std::vector<FaceNode> mNodes;          ///< List of nodes
 };
 } // namespace Dali::Scene3D::Internal::Algorithm
-#endif // DALI_SCENE3D_INTERNAL_PATH_FINDER_DJIKSTRA_H
+#endif // DALI_SCENE3D_INTERNAL_PATH_FINDER_DIJKSTRA_H

diff --git a/dali-scene3d/internal/file.list b/dali-scene3d/internal/file.list
index 9ea43a8..761ebb8 100644 (file)
--- a/dali-scene3d/internal/file.list
+++ b/dali-scene3d/internal/file.list
@@ -2,7 +2,7 @@ set(scene3d_internal_dir "${scene3d_dir}/internal")
 
 set(scene3d_src_files ${scene3d_src_files}
        ${scene3d_internal_dir}/algorithm/navigation-mesh-impl.cpp
-       ${scene3d_internal_dir}/algorithm/path-finder-djikstra.cpp
+       ${scene3d_internal_dir}/algorithm/path-finder-dijkstra.cpp
        ${scene3d_internal_dir}/algorithm/path-finder-spfa.cpp
        ${scene3d_internal_dir}/algorithm/path-finder-spfa-double-way.cpp
        ${scene3d_internal_dir}/common/environment-map-load-task.cpp

diff --git a/dali-scene3d/public-api/algorithm/path-finder.cpp b/dali-scene3d/public-api/algorithm/path-finder.cpp
index 621fc82..2f89e5d 100644 (file)
--- a/dali-scene3d/public-api/algorithm/path-finder.cpp
+++ b/dali-scene3d/public-api/algorithm/path-finder.cpp
@@ -19,7 +19,7 @@
 
 // INTERNAL INCLUDES
 // default algorithm
-#include <dali-scene3d/internal/algorithm/path-finder-djikstra.h>
+#include <dali-scene3d/internal/algorithm/path-finder-dijkstra.h>
 #include <dali-scene3d/internal/algorithm/path-finder-spfa-double-way.h>
 #include <dali-scene3d/internal/algorithm/path-finder-spfa.h>
 
@@ -31,9 +31,9 @@ std::unique_ptr<PathFinder> PathFinder::New(NavigationMesh& navigationMesh, Path
 
   switch(algorithm)
   {
-    case PathFinderAlgorithm::DJIKSTRA_SHORTEST_PATH:
+    case PathFinderAlgorithm::DIJKSTRA_SHORTEST_PATH:
     {
-      impl = new Dali::Scene3D::Internal::Algorithm::PathFinderAlgorithmDjikstra(navigationMesh);
+      impl = new Dali::Scene3D::Internal::Algorithm::PathFinderAlgorithmDijkstra(navigationMesh);
       break;
     }
     case PathFinderAlgorithm::SPFA:

diff --git a/dali-scene3d/public-api/algorithm/path-finder.h b/dali-scene3d/public-api/algorithm/path-finder.h
index 5d2a6f1..8b5e15c 100644 (file)
--- a/dali-scene3d/public-api/algorithm/path-finder.h
+++ b/dali-scene3d/public-api/algorithm/path-finder.h
@@ -32,11 +32,11 @@ using WayPointList = std::vector<Scene3D::Algorithm::WayPoint>;
  */
 enum class PathFinderAlgorithm
 {
-  DJIKSTRA_SHORTEST_PATH, ///< Using A* variant (Djikstra) finding a shortest path
+  DIJKSTRA_SHORTEST_PATH, ///< Using A* variant (Dijkstra) finding a shortest path
   SPFA,                   ///< Using SPFA-SLF (Shortest Path Fast Algorithm with Short Label First) finding a shortest path.
   SPFA_DOUBLE_WAY,        ///< Using SPFA-SLF double way. It might not find shortest, but will use less memory.
 
-  DEFAULT = DJIKSTRA_SHORTEST_PATH, ///< Default algorithm to use
+  DEFAULT = DIJKSTRA_SHORTEST_PATH, ///< Default algorithm to use
 };
 
 /**