K33 ainda falho

Author: AdsonEsteves

src/core/algoritmos/PlanarityTest.java

@@ -23,6 +23,7 @@ public static boolean isPlanar(Grafo g)
             return true;
         }          
 
+//        if(ishomeomorphictoK5(g) || ishomeomorphictoK33(g))
         if(ishomeomorphictoK5(g))
         {
             System.out.println("testaK5");
@@ -101,7 +102,28 @@ public static boolean ishomeomorphictoK5(Grafo g)
 
     public static boolean ishomeomorphictoK33(Grafo g)
     {
-        return true;
+        List<Vertice> vertices = g.getVertices();
+        vertices = remove2Less(vertices);
+        
+        if(vertices.size()<6)
+        {
+             return false;
+        }
+        for (int i = 0; i < vertices.size(); i++) {
+            List<Vertice> permutaveisM =  new ArrayList<>();
+            List<Vertice> permutaveisN =  new ArrayList<>();
+            permutaveisM.add(vertices.get(i));
+            permutaveisM.add(vertices.get((i+1)%vertices.size()));
+            permutaveisM.add(vertices.get((i+2)%vertices.size()));
+            permutaveisN.add(vertices.get((i+3)%vertices.size()));
+            permutaveisN.add(vertices.get((i+4)%vertices.size()));
+            permutaveisN.add(vertices.get((i+5)%vertices.size()));
+            if(hasK33(g, permutaveisM, permutaveisN)){
+                return true;
+            }
+            System.out.println("entrou");
+        } 
+        return false;
     }
 
     public static boolean hasK5(Grafo g, List<Vertice> permutaveis)
@@ -111,10 +133,12 @@ public static boolean hasK5(Grafo g, List<Vertice> permutaveis)
         for (int i = 0; i < permutaveis.size(); i++) {
             for (int j = i; j < permutaveis.size(); j++) {
                 if(i!=j){
-                    if(sa.search(g, permutaveis.get(i).getId(), permutaveis.get(j).getId())==null){
+                    Vertice v = sa.search(g, permutaveis.get(i).getId(), permutaveis.get(j).getId());
+                    if(v==null){
                         System.out.println("deu merda "+permutaveis.get(i).getRotulo()+" pro "+permutaveis.get(j).getRotulo());
                         return false;
                     }
+//                    reajustar_visitados(g, v);
                     g.getVertice(permutaveis.get(i).getId()).setVisitado(false);
                     g.getVertice(permutaveis.get(j).getId()).setVisitado(false);
                 }                
@@ -124,6 +148,28 @@ public static boolean hasK5(Grafo g, List<Vertice> permutaveis)
         return true;
     }
 
+    public static boolean hasK33(Grafo g, List<Vertice> permutaveisM, List<Vertice> permutaveisN)
+    {
+        g.resetProperties();
+        SearchAlgorithm sa = SearchAlgorithmFactory.build(SearchAlgorithmFactory.BREADTH_FIRST_SEARCH);
+        for (int i = 0; i < permutaveisM.size(); i++) {
+            for (int j = 0; j < permutaveisN.size(); j++) {
+                if(i!=j){
+                    Vertice N = sa.search(g, permutaveisM.get(i).getId(), permutaveisN.get(j).getId());
+                    System.out.println("Tentar "+permutaveisM.get(i).getRotulo()+" pro "+permutaveisN.get(j).getRotulo());
+                    if(N==null){
+                        System.out.println("deu merda "+permutaveisM.get(i).getRotulo()+" pro "+permutaveisN.get(j).getRotulo());
+                        return false;
+                    }
+                    g.getVertice(permutaveisM.get(i).getId()).setVisitado(false);
+                    g.getVertice(permutaveisN.get(j).getId()).setVisitado(false);
+                }                
+                System.out.println("deboa "+permutaveisM.get(i).getRotulo()+" pro "+permutaveisN.get(j).getRotulo());
+            }
+        }
+        return true;
+    }
+    
     public static List<Vertice> remove3Less(List<Vertice> vertices)
     {
         List<Vertice> higher =  new ArrayList<>();
@@ -137,4 +183,36 @@ public static List<Vertice> remove3Less(List<Vertice> vertices)
         }
         return higher;
     }
+    public static List<Vertice> remove2Less(List<Vertice> vertices)
+    {
+        List<Vertice> higher =  new ArrayList<>();
+        
+        for (Vertice vertice : vertices) {
+            System.out.println("Grau:"+vertice.getGrau());
+            if(vertice.getGrau()>2){
+                
+                higher.add(vertice);
+            }
+        }
+        return higher;
+    }
+
+    private static void reajustar_visitados(Grafo g, Vertice N) {
+        g.resetProperties();
+        while(N.getAnterior()!=null)
+        {
+            N = N.getAnterior();
+            N.setVisitado(true);
+        }
+        N.setVisitado(false);
+        N.setAnterior(null);
+    }
+
+    private static void print_vizitados(Grafo g) {
+        System.out.print("Visitados: ");
+        for (Vertice vertice : g.getVertices()) {
+            if(vertice.isVisitado())
+            System.out.println(vertice.getRotulo()+" ");
+        }
+    }
 }

src/core/model/Grafo.java

@@ -180,6 +180,12 @@ public void resetProperties(){
         }
         visitados = new ArrayList<>();
     }
+    
+    public void resetAnteriores(){
+        for (Vertice vertice : vertices) {
+            vertice.setAnterior(null);
+        }
+    }
 
     public boolean verificarVisitados() {
         for(Vertice vertice : vertices){