Merge pull request #6 from EMACC99/dev

Bipartite matchings

Author: EMACC99

algorithms/apareamientos.hpp

@@ -0,0 +1,94 @@
+#pragma once
+
+#include <list>
+
+#include "../includes/globals.hpp"
+#include "../includes/edge.hpp"
+#include "../includes/node.hpp"
+#include "componentes_conexas.hpp" // de aqui sacamos get vecinos
+
+
+std::vector<int> apareamientos_iniciales(){
+    // lo mas facil de hacer, pues es agarrar un nodo y juntarlo con su vecino, revisando que no esten apareados anteriormente
+
+    std::vector<int> matches(vertices.size(), -1);
+    for (auto &n : vertices){
+        for (auto &h : get_vecinos(n)){
+            if (matches[h] == -1 && matches[n.id] == -1){
+                matches[h] = n.id;
+                matches[n.id] = h;
+                break;
+            }
+        }
+    }
+    return matches;
+}
+
+
+std::vector<int> bfs(const node &root, std::vector<int> &matches){ 
+    std::vector <int> caminito_bfs;
+    std::vector<bool> visited(vertices.size(), false);
+    std::vector<int> queue;
+
+    visited[root.id] = true;
+
+    queue.push_back(root.id);
+    while(!queue.empty()){
+        int s = queue.front();
+        caminito_bfs.push_back(s);
+        queue.pop_back();
+        for (auto &v : get_vecinos(vertices[s])){
+            if (!visited[v] && matches[v] == -1)
+                queue.push_back(v);
+        }
+    }
+    // std::vector<int> matches(vertices.size(), 0);
+
+    // ahora necesito ver quien esta matcheado con quien
+    // para eso, tengo dos opciones, generar un vector de aristas y decir que tienen match, mas facil, o
+    // generar un vector de nodos que digan que esos dos estan mathcheados
+    for (int i = 1; i < caminito_bfs.size(); i += 2){
+        matches[caminito_bfs[i - 1]] = matches[caminito_bfs[i]];
+        matches[caminito_bfs[i]] = matches[caminito_bfs[i - 1]];
+    }
+
+    return matches;
+}   
+
+
+node get_first_not_matched_node(std::vector<int> &matches){
+    node not_matched;
+    not_matched.id = -2; // if the id is -2 there no more matchings
+    for (int i = 0; i < matches.size(); ++i){
+        if (matches[i] == -1){
+            not_matched = vertices[i];
+            break;
+        }
+    }
+
+    return not_matched;
+}
+
+std::vector<int> apareamientos(){
+    // primero, tenemos que hacer los apareamientos iniciales
+    std::vector<int> inital_matches = apareamientos_iniciales();
+    std::vector<bool> visited(vertices.size(), false);
+
+    //ahora tenemos que sacar el nuevo camino de aumento con bfs
+    // lo que le tenemos que pasar es un nodo que no este en initial_matches
+
+    node first_not_matches = get_first_not_matched_node(inital_matches);
+
+    if (first_not_matches.id == -2)
+        return inital_matches;
+
+    std::vector<int> matches = bfs(first_not_matches, inital_matches);
+
+    while (matches != inital_matches){
+        inital_matches = matches;
+        node first_not_matches = get_first_not_matched_node(inital_matches);
+        matches = bfs(first_not_matches, inital_matches);
+    }
+
+    return matches;
+}

automated_setup.sh

@@ -115,13 +115,18 @@ void event_handler::select_algorithms(const sf::Event &event, sf::RenderWindow &
     else if (sf::Keyboard::isKeyPressed(sf::Keyboard::Num8) || sf::Keyboard::isKeyPressed(sf::Keyboard::Numpad8)){ //TODO rewirite function for diffent types of LCA
        std::vector<int> parents = call_get_parents();
        if (!parents.empty()){
-           node lca = call_lca_lite(parents);
+           node lca = call_lca(parents);
            std::cout << "El LCA es " << lca.id << std::endl;
            make_sprite_red(sprites[lca.id]);
        }
        else
         std::cout << "Hay, un ciclo, no es arbol" << std::endl;
     }
+
+    else if(sf::Keyboard::isKeyPressed(sf::Keyboard::Num9) || sf::Keyboard::isKeyPressed(sf::Keyboard::Numpad9)){
+        std::vector<edge> matches = call_bipartite_matching();
+        create_lineas_coloreadas(matches);
+    }
 }
 /**
  * @brief handles the interactivity for the visualizer

includes/event_handler_class.hpp

@@ -11,6 +11,7 @@
 #include "../algorithms/prim3.hpp"
 #include "../algorithms/componentes_conexas.hpp"
 #include "../algorithms/LCA.hpp"
+#include "../algorithms/apareamientos.hpp"
 
 #define MAX_WEIGHT 25; 
 //fuciones de ayuda para dibujar y ser interactivos
@@ -127,7 +128,7 @@ void assign_random_weights_to_edge(){
  * @param mst Prim or Kruskal
  * @param color sf::Color
  */
-void create_lineas_coloreadas(const std::vector<edge> &mst, const sf::Color &color ){ //move to visualizer
+void create_lineas_coloreadas(const std::vector<edge> &mst, const sf::Color &color = sf::Color::Red){ //move to visualizer
 
     for (auto &elem: mst){
         lineas_coloreadas.push_back(sf::Vertex(sprites[elem.nodes[0]].getPosition()));
@@ -283,7 +284,7 @@ std::vector<int> call_get_parents(){
     return get_parents(vertices[root_index]);
 }
 
-node call_lca_lite(const std::vector<int> &padres){
+node call_lca(const std::vector<int> &padres){
     int v_id,u_id;
     std::cout << "Id del primer nodo: ";
     std::cin >> v_id;
@@ -295,6 +296,23 @@ node call_lca_lite(const std::vector<int> &padres){
     return factor_deconposition(padres, u, v);
 }
 
+std::vector<edge> call_bipartite_matching(){
+    std::vector<int> matches = apareamientos();
+    std::vector<edge> bipartite_edges;
+    
+    int size = matches.size()/2;
+    for (int i = 0; i < size; ++i){
+        edge a;
+        std::vector<int> nodes;
+        nodes.push_back(i);
+        nodes.push_back(matches[i]);
+        a.nodes = nodes;
+        a.colored = true;
+        bipartite_edges.push_back(a);
+    } 
+    return bipartite_edges;
+}
+
 //dar parametros para el visualizador para dibujar cosas en lugares random
 /**
  * @brief  displays the components in random positions on the canvas

includes/functions.hpp

@@ -1,5 +1,5 @@
 CC=g++
-CFLAGS=-c -Wall -Wpedantic -Wextra -Wno-sign-compare -std=c++17 -Ofast
+CFLAGS=-c -Wall -Wpedantic -Wextra -Wno-sign-compare -Wno-maybe-uninitialized -std=c++17 -Ofast
 LDFLAGS=
 LIBFLAGS=-lsfml-graphics -lsfml-window -lsfml-system
 SOURCES=main.cpp
@@ -18,8 +18,8 @@ $(EXECUTABLE): $(OBJECTS)
 clean:
 	rm *.o $(EXECUTABLE)
 
-install:
-	#install -s $(EXECUTABLE) $(BINDIR)
-	sudo cp -u $(EXECUTABLE) $(BINDIR)
-uninstall:
-	sudo rm $(BINDIR)/$(EXECUTABLE)
+# install:
+# 	#install -s $(EXECUTABLE) $(BINDIR)
+# 	sudo cp -u $(EXECUTABLE) $(BINDIR)
+# uninstall:
+# 	sudo rm $(BINDIR)/$(EXECUTABLE)