style: improve code formatting and consistency across multiple files

Mr-MRF-Dev · Jan 16, 2025 · eb404b3 · eb404b3
1 parent 1597b21
commit eb404b3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/src/Area/Area.h b/src/Area/Area.h
@@ -13,8 +13,8 @@ class Area {
 
     public:
         Area(int a1, int a2, int b1, int b2, string name);
-        Area(Area &tmp);
-		bool operator==(Area tmp);
+        Area(Area& tmp);
+        bool operator==(Area tmp);
         bool checkInArea(int x, int y);
         string getName();
 
@@ -35,7 +35,6 @@ class AreaList {
         AreaList(int c = 10);
         bool addArea(Area a);
         Area* search(string name);
-
 };
 
 #endif
diff --git a/src/Location/Location.cpp b/src/Location/Location.cpp
@@ -43,5 +43,5 @@ string Point::getStr() {
 }
 
 int Point::getDistance(Point temp) {
-    return pow((x - temp.getX()) , 2) + pow((y - temp.getY()) , 2);
+    return pow((x - temp.getX()), 2) + pow((y - temp.getY()), 2);
 }
diff --git a/src/Location/Location.h b/src/Location/Location.h
@@ -2,8 +2,9 @@
 #ifndef LOCATION_H
 #define LOCATION_H
 
-#include <string>
 #include <cmath>
+#include <string>
+
 #include "debug.h"
 using namespace std;
 

diff --git a/src/Main/debug.h b/src/Main/debug.h
@@ -12,19 +12,19 @@ using namespace std;
 
 #if DEBUG
 
-    #define log2(X, Y)                                                     \
+    #define log2(X, Y)                                                    \
         cout << Color_Gray << "LOG >>> " << X << ": " << Y << Color_Reset \
              << endl;
 
-    #define log3(X, Y, Z)                                                \
+    #define log3(X, Y, Z)                                               \
         cout << Color_Gray << "LOG >>> " << X << ": " << Y << ", " << Z \
              << Color_Reset << endl;
 
-    #define Err2(X, Y)                                                    \
+    #define Err2(X, Y)                                                   \
         cout << Color_Red << "Err >>> " << Color_Reset << X << ": " << Y \
              << endl;
 
-    #define Err3(X, Y, Z)                                                      \
+    #define Err3(X, Y, Z)                                                     \
         cout << Color_Red << "Err >>> " << Color_Reset << X << ": " << Y ", " \
              << Z << endl;
 

diff --git a/src/Main/main.cpp b/src/Main/main.cpp
@@ -2,7 +2,7 @@
 
 int main() {
 
-    // create a db for Branchs
+    // create a db for Branch's
     pizzaDataBase* db = new pizzaDataBase;
     AreaList* l = new AreaList;
     KDTree* ap = new KDTree;

diff --git a/src/PizzaBranch/kdTree.cpp b/src/PizzaBranch/kdTree.cpp
@@ -631,22 +631,21 @@ branch* KDTree::findNearstBranchFilter(Point t, string main_name) {
     return NULL;
 }
 
-void KDTree::helpFindInRadius(Point t, int r, treeNode* root, int depth, vector<branch*>* vec) {
+void KDTree::helpFindInRadius(Point t, int r, treeNode* root, int depth,
+                              vector<branch*>* vec) {
 
     if (root == NULL) return;
 
-    if (t.getDistance(root->getPoint()) <= pow(r,2)){
+    if (t.getDistance(root->getPoint()) <= pow(r, 2)) {
         vec->push_back(root->getNode());
     }
 
     int root_x = root->getPoint().getX();
     int root_y = root->getPoint().getY();
 
-
     helpFindInRadius(t, r, root->getLeft(), ++depth, vec);
 
     helpFindInRadius(t, r, root->getRight(), ++depth, vec);
-
 }
 
 vector<branch*> KDTree::findInRadius(Point t, int r) {

diff --git a/src/PizzaBranch/kdTree.h b/src/PizzaBranch/kdTree.h
@@ -72,13 +72,15 @@ class KDTree {
 
         treeNode* helpFindNearstBranch(Point t, treeNode* root, treeNode* near,
                                        int depth);
-
-        treeNode* helpFindNearstBranchFilter(Point t, treeNode* root, treeNode* near,
-                                       int depth, string name);
+
+        treeNode* helpFindNearstBranchFilter(Point t, treeNode* root,
+                                             treeNode* near, int depth,
+                                             string name);
 
         int checkOtherBr(Point t, treeNode* root, int depth);
 
-        void helpFindInRadius(Point t, int r, treeNode* root, int depth, vector<branch*>* vec);
+        void helpFindInRadius(Point t, int r, treeNode* root, int depth,
+                              vector<branch*>* vec);
 
     public:
         KDTree();