stop

commit cbf5dc0ee992cabebb61ff4bd3afb21bbbc28b7f (HEAD -> main)
Author: SarinhaCortez <up202205636@g.uporto.pt>
Date:   Tue Apr 30 11:37:53 2024 +0100

    .gitignore updated

diff --git a/.gitignore b/.gitignore
index dc36249..52b09c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 cmake-build-debug/
 dataset/
+.idea/

commit 5244c97033472f59bc0301d2e02b7437005e8545
Author: SarinhaCortez <up202205636@g.uporto.pt>
Date:   Thu Apr 25 22:08:05 2024 +0100

    parser super done

diff --git a/DataParser.cpp b/DataParser.cpp
index 1839fd9..bedba78 100644
--- a/DataParser.cpp
+++ b/DataParser.cpp
@@ -10,12 +10,10 @@ void ToyGraphParser(const string& filename, Graph<int> &g) {
     if (!csv.is_open()) {
         cerr << "Error opening csv file!" << endl;
     }
-
+    unordered_set<int> seenVertices;
     string line;
     getline(csv, line);
 
-    unordered_set<int> seenVertices;
-
         while (getline(csv, line)) {
             istringstream ss(line);
             string origin_str, destination_str, distance_str;
diff --git a/Utils.cpp b/Utils.cpp
new file mode 100644
index 0000000..4bc48ef
--- /dev/null
+++ b/Utils.cpp
@@ -0,0 +1,5 @@
+//
+// Created by saracortez on 25/04/24.
+//
+
+#include "Utils.h"
diff --git a/Utils.h b/Utils.h
new file mode 100644
index 0000000..59b071a
--- /dev/null
+++ b/Utils.h
@@ -0,0 +1,4 @@
+#ifndef DA_PROJETO2_UTILS_H
+#define DA_PROJETO2_UTILS_H
+
+#endif //DA_PROJETO2_UTILS_H
diff --git a/main.cpp b/main.cpp
index fff6d39..ebb6b30 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,12 +1,14 @@
 #include "DataParser.h"
 
 int main(){
-
+    /*fully connected  stadiums.csv, tourism.csv), not fully connected (shipping.csv) */
     Graph<int> g;
     Parser("tourism.csv", g);
     //Parser("edges_25.csv", g);
     //Parser("graph1", g);
+    /*
     cout <<"Edges"<<endl;
+
     for(auto v : g.getVertexSet()){
         for(auto e : v->getAdj()){
             cout << e->getWeight()<<endl;
@@ -17,4 +19,5 @@ int main(){
     for(auto v : g.getVertexSet()){
         cout << v->getInfo()<<endl;
     }
+    */
 }
\ No newline at end of file
diff --git a/menu.cpp b/menu.cpp
new file mode 100644
index 0000000..bf3e95e
--- /dev/null
+++ b/menu.cpp
@@ -0,0 +1,2 @@
+
+#include "menu.h"
diff --git a/menu.h b/menu.h
new file mode 100644
index 0000000..4c78055
--- /dev/null
+++ b/menu.h
@@ -0,0 +1,10 @@
+#ifndef DA_PROJETO2_MENU_H
+#define DA_PROJETO2_MENU_H
+
+#include "DataParser.h"
+
+Graph<int> g;
+
+
+
+#endif //DA_PROJETO2_MENU_H

commit 093205bc94947b7774d4b180d4f0d80b60ba054f
Author: SarinhaCortez <up202205636@g.uporto.pt>
Date:   Thu Apr 25 21:42:08 2024 +0100

    parser super done

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dc36249
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+cmake-build-debug/
+dataset/
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..4b448dd
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.28)
+project(DA_projeto2)
+
+set(CMAKE_CXX_STANDARD 14)
+
+include_directories(.)
+include_directories(data_structures)
+
+add_executable(DA_projeto2
+        data_structures/Graph.h
+        data_structures/MutablePriorityQueue.h
+        data_structures/UFDS.cpp
+        data_structures/UFDS.h
+        DataParser.cpp
+        DataParser.h
+        main.cpp)
diff --git a/DataParser.cpp b/DataParser.cpp
new file mode 100644
index 0000000..1839fd9
--- /dev/null
+++ b/DataParser.cpp
@@ -0,0 +1,168 @@
+//
+// Created by saracortez on 25/04/24.
+//
+
+#include "DataParser.h"
+
+void ToyGraphParser(const string& filename, Graph<int> &g) {
+    ifstream csv("../dataset/Toy-Graphs/Toy-Graphs/" + filename);
+
+    if (!csv.is_open()) {
+        cerr << "Error opening csv file!" << endl;
+    }
+
+    string line;
+    getline(csv, line);
+
+    unordered_set<int> seenVertices;
+
+        while (getline(csv, line)) {
+            istringstream ss(line);
+            string origin_str, destination_str, distance_str;
+
+            getline(ss, origin_str, ',');
+            getline(ss, destination_str, ',');
+            getline(ss, distance_str, ',');
+
+            int origin = stoi(origin_str);
+            int destination = stoi(destination_str);
+            double distance = stod(distance_str);
+
+            if (seenVertices.insert(origin).second) {
+                g.addVertex(origin);
+            }
+            if (seenVertices.insert(destination).second) {
+                g.addVertex(destination);
+            }
+
+            g.addEdge(origin, destination, distance);
+        }
+
+        csv.close();
+}
+
+void ExtraMSGraphParser(const string& edge_filename, Graph<int> &g){
+
+    string line;
+
+    ifstream nodes("../dataset/Extra_Medium_Sized_Graphs/Extra_Medium_Sized_Graphs/nodes.csv");
+
+    if (!nodes.is_open()) {
+        cerr << "Error opening nodes file!" << endl;
+    }
+
+    getline(nodes, line);
+
+    while (getline(nodes, line)) {
+        istringstream ss(line);
+        string id_str, longi_str, lat_str;
+
+        getline(ss, id_str, ',');
+        getline(ss, longi_str, ',');
+        getline(ss, lat_str, ',');
+
+        int id = stoi(id_str);
+        double lon = stod(longi_str);
+        double lat = stod(lat_str);
+
+        g.addVertex(id);
+        (*(g.getVertexSet().end()-1))->setLong(lon);
+        (*(g.getVertexSet().end()-1))->setLat(lat);
+    }
+    nodes.close();
+
+    ifstream edges("../dataset/Extra_Medium_Sized_Graphs/Extra_Medium_Sized_Graphs/"+ edge_filename);
+
+    if (!edges.is_open()) {
+        cerr << "Error opening edges file!" << endl;
+    }
+
+    while (getline(edges, line)) {
+
+        istringstream ss(line);
+        string orig_str, dest_str, dist_str;
+
+        getline(ss, orig_str, ',');
+        getline(ss, dest_str, ',');
+        getline(ss, dist_str, ',');
+
+        int orig = stoi(orig_str);
+        int dest = stoi(dest_str);
+        double dist = stod(dist_str);
+
+        g.addEdge(orig, dist, dest);
+
+    }
+
+    edges.close();
+
+}
+
+void RealWorldGraphParser(const string& dir_name, Graph<int> &g){
+
+    string line;
+    ifstream nodes("../dataset/Real-World-Graphs/Real-World-Graphs/"+ dir_name + "/nodes.csv");
+
+    if (!nodes.is_open()) {
+        cerr << "Error opening nodes file!" << endl;
+    }
+
+    getline(nodes, line);
+
+    while (getline(nodes, line)) {
+        istringstream ss(line);
+        string id_str, longi_str, lat_str;
+
+        getline(ss, id_str, ',');
+        getline(ss, longi_str, ',');
+        getline(ss, lat_str, ',');
+
+        int id = stoi(id_str);
+        double lon = stod(longi_str);
+        double lat = stod(lat_str);
+
+        g.addVertex(id);
+        (*(g.getVertexSet().end()-1))->setLong(lon);
+        (*(g.getVertexSet().end()-1))->setLat(lat);
+    }
+
+    nodes.close();
+    ifstream edges("../dataset/Real-World-Graphs/Real-World-Graphs/"+ dir_name + "/edges.csv");
+
+    if (!edges.is_open()) {
+        cerr << "Error opening edges file!" << endl;
+        return;
+    }
+
+    getline(edges, line);
+
+    while (getline(edges, line)) {
+
+        istringstream ss(line);
+        string orig_str, dest_str, dist_str;
+
+        getline(ss, orig_str, ',');
+        getline(ss, dest_str, ',');
+        getline(ss, dist_str, ',');
+
+        int orig = stoi(orig_str);
+        int dest = stoi(dest_str);
+        double dist = stod(dist_str);
+
+        g.addEdge(orig, dist, dest);
+
+    }
+
+    edges.close();
+}
+
+void Parser(const string& path, Graph<int> &g){
+    int s = path.size();
+    if(path[0] == 'e')
+        ExtraMSGraphParser(path, g);
+    else if(path[s-1] == 'v')
+        ToyGraphParser(path, g);
+    else
+        RealWorldGraphParser(path, g);
+}
+
diff --git a/DataParser.h b/DataParser.h
new file mode 100644
index 0000000..8d1b9dd
--- /dev/null
+++ b/DataParser.h
@@ -0,0 +1,22 @@
+#ifndef DA_PROJETO2_DATAPARSER_H
+#define DA_PROJETO2_DATAPARSER_H
+
+#include "data_structures/Graph.h"
+#include <string>
+#include <fstream>
+#include <sstream>
+#include <iostream>
+#include <unordered_set>
+
+using namespace std;
+/**
+ * Toy Graph parser receives the name of a file xxxxx.csv
+ * Extra receives a name in the form "edges_XXXX.csv"
+ * RW receives the name of a directory
+ * based on this informations, Parser knows which funct to call
+ */
+void ToyGraphParser(const string& filename, Graph<int> &g);
+void ExtraMSGraphParser(const string& edge_filename, Graph<int> &g);
+void RealWorldGraphParser(const string& dir_name, Graph<int> &g);
+void Parser(const string& path, Graph<int> &g); //a wrap
+#endif //DA_PROJETO2_DATAPARSER_H
diff --git a/data_structures/Graph.h b/data_structures/Graph.h
new file mode 100644
index 0000000..baf63c6
--- /dev/null
+++ b/data_structures/Graph.h
@@ -0,0 +1,698 @@
+// Original code by Gonçalo Leão

+// Updated by DA 2023/2024 Team

+

+#ifndef DA_TP_CLASSES_GRAPH

+#define DA_TP_CLASSES_GRAPH

+

+#include <iostream>

+#include <vector>

+#include <queue>

+#include <limits>

+#include <algorithm>

+#include "../data_structures/MutablePriorityQueue.h"

+

+template <class T>

+class Edge;

+

+#define INF std::numeric_limits<double>::max()

+

+/************************* Vertex  **************************/

+

+template <class T>

+class Vertex {

+public:

+    Vertex(T in);

+    bool operator<(Vertex<T> & vertex) const; // // required by MutablePriorityQueue

+

+    T getInfo() const;

+    std::vector<Edge<T> *> getAdj() const;

+    bool isVisited() const;

+    bool isProcessing() const;

+    unsigned int getIndegree() const;

+    double getDist() const;

+    Edge<T> *getPath() const;

+    std::vector<Edge<T> *> getIncoming() const;

+

+    void setInfo(T info);

+    void setVisited(bool visited);

+    void setProcesssing(bool processing);

+    void setIndegree(unsigned int indegree);

+    void setDist(double dist);

+    void setPath(Edge<T> *path);

+    Edge<T> * addEdge(Vertex<T> *dest, double w);

+    bool removeEdge(T in);

+    void removeOutgoingEdges();

+    void setLat(double lat);

+    void setLong(double longit);

+    int getLat()const ;

+    int getLong()const ;

+    friend class MutablePriorityQueue<Vertex>;

+

+protected:

+    T info;                // info node

+    // outgoing edges

+    std::vector<Edge<T> *> adj;

+    // auxiliary fields

+    bool visited = false; // used by DFS, BFS, Prim ...

+    bool processing = false; // used by isDAG (in addition to the visited attribute)

+    unsigned int indegree; // used by topsort

+    double dist = 0;

+    Edge<T> *path = nullptr;

+

+    std::vector<Edge<T> *> incoming; // incoming edges

+

+    int queueIndex = 0; 		// required by MutablePriorityQueue and UFDS

+

+    void deleteEdge(Edge<T> *edge);

+

+    double latitude = 0.0, longitude = 0.0; //for not toy graphs

+};

+
[