From 101e419dc6e53a4360f9ad519094c38c4e3e809d Mon Sep 17 00:00:00 2001
From: pacopua <113210040+pacopua@users.noreply.github.com>
Date: Sun, 13 Oct 2024 16:45:15 +0200
Subject: [PATCH 01/16] Create hola

---
 hola | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 hola

diff --git a/hola b/hola
new file mode 100644
index 0000000..ffd8eeb
--- /dev/null
+++ b/hola
@@ -0,0 +1 @@
+salu2

From 02bc5bb7893115d5092f50451b047955447116bd Mon Sep 17 00:00:00 2001
From: pacopua <113210040+pacopua@users.noreply.github.com>
Date: Sun, 13 Oct 2024 16:48:05 +0200
Subject: [PATCH 02/16] Delete hola

---
 hola | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 hola

diff --git a/hola b/hola
deleted file mode 100644
index ffd8eeb..0000000
--- a/hola
+++ /dev/null
@@ -1 +0,0 @@
-salu2

From 39097a64bee0ec087dac7d30396c60e120540ff2 Mon Sep 17 00:00:00 2001
From: pacopua <113210040+pacopua@users.noreply.github.com>
Date: Sun, 13 Oct 2024 16:53:38 +0200
Subject: [PATCH 03/16] Update_Estado_FuncionesSwap.java

---
 src/com/lluc/practicaIA1/Estado.java | 177 +++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)

diff --git a/src/com/lluc/practicaIA1/Estado.java b/src/com/lluc/practicaIA1/Estado.java
index 3a2ec0e..f2af5de 100644
--- a/src/com/lluc/practicaIA1/Estado.java
+++ b/src/com/lluc/practicaIA1/Estado.java
@@ -68,6 +68,183 @@ public double heuristicoCoseFelicidad() {
         return felicidad + coste;
     }
 
+    public boolean moure_paquete(int ip, int oferta_desti, Paquetes paquetes, Transporte ofertas) {
+    	Paquete p = paquetes.get(ip);
+    	double peso_paquete = p.getPeso();
+    	
+    	vecOfertas[vecPaquetes[ip]] += peso_paquete;
+    	vecOfertas[oferta_desti] -= peso_paquete;
+    	
+    	Oferta oferta_des = ofertas.get(oferta_desti);
+    	Oferta oferta_og = ofertas.get(vecPaquetes[ip]);
+    	
+    	if (oferta_des.getPesomax() < vecOfertas[oferta_desti]) return false;
+    
+    	coste += oferta_des.getPrecio()*peso_paquete;
+    	coste -= oferta_og.getPrecio()*peso_paquete;
+    	
+    	int ofertadesti_tempal = 0;
+    	if(oferta_des.getDias() == 3 || oferta_des.getDias() == 4) ofertadesti_tempal = 1;
+    	else if (oferta_des.getDias() == 5) ofertadesti_tempal = 2;
+    	
+    	int ofertaog_tempal = 0;
+    	if(oferta_og.getDias() == 3 || oferta_og.getDias() == 4) ofertaog_tempal = 1;
+    	else if (oferta_og.getDias() == 5) ofertaog_tempal = 2;
+    	
+    	//precio guardar en almacen
+    	coste -= ofertaog_tempal* 0.25 * peso_paquete;
+    	coste += ofertadesti_tempal* 0.25 * peso_paquete;
+    	
+    	if(p.getPrioridad() == Paquete.PR1) {
+    		if(oferta_des.getDias() > 1) return false;
+    	}
+    	else if(p.getPrioridad() == Paquete.PR2) {
+    		if(oferta_des.getDias() > 3) return false;
+    	}
+    	
+    	int antelacion_original = 0;
+    	if(p.getPrioridad() == Paquete.PR2) {
+    		if(oferta_og.getDias() == 1) antelacion_original = 1;
+    	}
+    	else if(p.getPrioridad() == Paquete.PR3) {
+    		if(oferta_og.getDias() == 1) antelacion_original = 2;
+    		if(oferta_og.getDias() == 2 || oferta_og.getDias() == 3) antelacion_original = 1;
+    	}
+    	
+    	felicidad -= antelacion_original;
+    	
+    	int nueva_antelacion = 0;
+    	
+    	if(p.getPrioridad() == Paquete.PR2) {
+    		if(oferta_des.getDias() == 1) nueva_antelacion = 1;
+    	}
+    	else if(p.getPrioridad() == Paquete.PR3) {
+    		if(oferta_des.getDias() == 1) nueva_antelacion = 2;
+    		if(oferta_des.getDias() == 2 || oferta_des.getDias() == 3) nueva_antelacion = 1;
+    	}
+    	
+    	felicidad += nueva_antelacion;
+    	
+    	vecPaquetes[ip] = oferta_desti;
+    	
+    	return true;
+    	
+    }
+    
+    public boolean swap(int paquete_1, int paquete_2, Paquetes paquetes, Transporte ofertas) {
+    	int ofertap1 = vecPaquetes[paquete_1];
+    	int ofertap2 = vecPaquetes[paquete_2];
+    	
+    	double peso_paquete1 = paquetes.get(paquete_1).getPeso();
+    	double peso_paquete2 = paquetes.get(paquete_2).getPeso();
+    	
+    	vecOfertas[ofertap1] += peso_paquete1 - peso_paquete2;
+    	vecOfertas[ofertap2] -= peso_paquete1 - peso_paquete2;
+    	
+    	Oferta oferta1 = ofertas.get(ofertap1);
+    	Oferta oferta2 = ofertas.get(ofertap2);
+    	
+    	if (oferta1.getPesomax() < vecOfertas[ofertap1]) return false;
+    	if (oferta2.getPesomax() < vecOfertas[ofertap2]) return false;
+    	
+    	//Calculamos los costes segun el precio de la oferta
+    	coste -= oferta1.getPrecio()*peso_paquete1 + oferta2.getPrecio()*peso_paquete2;
+    	coste += oferta1.getPrecio()*peso_paquete2 + oferta2.getPrecio()*peso_paquete1;
+    	
+    	int dias2 = oferta2.getDias();
+    	int dias1 = oferta1.getDias();
+    	
+    	Paquete paquete1 = paquetes.get(paquete_1);
+    	Paquete paquete2 = paquetes.get(paquete_2);
+    	
+    	
+    	//comprobamos is la nueva asignacion cumple la demanda de dias
+    	if(paquete1.getPrioridad() == Paquete.PR1) {
+    		if(oferta2.getDias() != 1) return false;
+    	} 
+    	else if(paquete1.getPrioridad() == Paquete.PR2) {
+    		if(oferta2.getDias() > 3) return false;
+    	}
+    	
+    	if(paquete2.getPrioridad() == Paquete.PR1) {
+    		if(oferta1.getDias() != 1) return false;
+    	} 
+    	else if(paquete2.getPrioridad() == Paquete.PR2) {
+    		if(oferta1.getDias() > 3) return false;
+    	}
+    	
+    	//calcular con que antelacion iban a llegar los paquetes en la distribucion original
+    	
+    	int antelacion_original1 = 0;
+    	int antelacion_original2 = 0;
+    	
+    	if(paquete1.getPrioridad() == Paquete.PR2) {
+    		if(oferta1.getDias() == 1) antelacion_original1 = 1;
+    	}
+    	else if(paquete1.getPrioridad() == Paquete.PR3) {
+    		if(oferta1.getDias() == 1) antelacion_original1 = 2;
+    		if(oferta1.getDias() == 2 || oferta1.getDias() == 3) antelacion_original1 = 1;
+    	}
+    	
+    	if(paquete2.getPrioridad() == Paquete.PR2) {
+    		if(oferta2.getDias() == 1) antelacion_original2 = 1;
+    	}
+    	else if(paquete2.getPrioridad() == Paquete.PR3) {
+    		if(oferta2.getDias() == 1) antelacion_original2 = 2;
+    		if(oferta2.getDias() == 2 || oferta2.getDias() == 3) antelacion_original2 = 1;
+    	}
+    	
+    	felicidad -= antelacion_original2 + antelacion_original1;
+    	
+    	//calculamos la nueva antelacion con la que llegaran los paquetes segun las asignaciones hechas
+    	
+    	int antelacion_postcambio1 = 0; 
+    	int antelacion_postcambio2 = 0;
+    	
+    	if(paquete1.getPrioridad() == Paquete.PR2) {
+    		if(oferta2.getDias() == 1) antelacion_postcambio1 = 1;
+    	}
+    	else if(paquete1.getPrioridad() == Paquete.PR3) {
+    		if(oferta2.getDias() == 1) antelacion_postcambio1 = 2;
+    		if(oferta2.getDias() == 2 || oferta2.getDias() == 3) antelacion_postcambio1 = 1;
+    	}
+    	
+    	
+    	if(paquete2.getPrioridad() == Paquete.PR2) {
+    		if(oferta1.getDias() == 1) antelacion_postcambio2 = 1;
+    	}
+    	else if(paquete2.getPrioridad() == Paquete.PR3) {
+    		if(oferta1.getDias() == 1) antelacion_postcambio2 = 2;
+    		if(oferta1.getDias() == 2 || oferta2.getDias() == 3) antelacion_postcambio2 = 1;
+    	}
+    	
+    	felicidad += antelacion_postcambio1 + antelacion_postcambio2;
+    	
+    	//Calculamos los costes segun el cambio de tiempo que están en almacenaje
+    	int oferta1_tempal = 0;
+    	if(oferta1.getDias() == 3 || oferta1.getDias() == 4) oferta1_tempal = 1;
+    	else if (oferta1.getDias() == 5) oferta1_tempal = 2;
+    	
+    	int oferta2_tempal = 0;
+    	if(oferta2.getDias() == 3 || oferta2.getDias() == 4) oferta2_tempal = 1;
+    	else if (oferta2.getDias() == 5) oferta2_tempal = 2;
+    	
+    	/*Aquests valors assignats a oferta1_tempal i oferta2_tempal es basen en el contingut del pdf
+    	El pdf dice que si una oferta es de 3 a 4 dias, se llevan el paquete en un dia
+    	si es de 5 dias se lleva el paquete en dos dias
+    	si es de 1 a 2 dias, se llevan el paquete ese mismo dia, por lo tanto no lo incluyo en el coste?
+    	*/
+    	
+    	coste -= oferta1_tempal*0.25 * peso_paquete1 + oferta2_tempal*0.25 * peso_paquete2;
+    	coste += oferta1_tempal*0.25 * peso_paquete2 + oferta2_tempal*0.25 * peso_paquete1;
+    	
+    	vecPaquetes[paquete_1] = ofertap2;
+    	vecPaquetes[paquete_2] = ofertap1;
+    	return true;
+    }
+
+    
+
     public void imprimir(Paquetes paquetes, Transporte transporte) {
         for (int i = 0; i < vecOfertas.length; ++i) {
             System.out.println("Oferta: " + i + " peso libre " + vecOfertas[i]);

From 44a479eb9a24cac1917415ffe48bd6781f8c7373 Mon Sep 17 00:00:00 2001
From: "verenisse.famara.caceres"
 <verenisse.famara.caceres@estudiantat.upc.edu>
Date: Sun, 13 Oct 2024 17:10:33 +0200
Subject: [PATCH 04/16] Imprimir TABLA

---
 src/com/lluc/practicaIA1/Estado.java | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/com/lluc/practicaIA1/Estado.java b/src/com/lluc/practicaIA1/Estado.java
index f2af5de..5546803 100644
--- a/src/com/lluc/practicaIA1/Estado.java
+++ b/src/com/lluc/practicaIA1/Estado.java
@@ -243,8 +243,25 @@ else if(paquete2.getPrioridad() == Paquete.PR3) {
     	return true;
     }
 
-    
+    //IMPRIMIR COMO TABLA
+    public void imprimir_tabla(Paquetes paquetes, Transporte transporte) {
+        for (int i = 0; i < vecOfertas.length; ++i) {
+            double peso_acumulado = 0.00;
+            System.out.println("---------------------------------------------------------------------------------------------------------");
+            System.out.print("| Oferta: " + i + ", Peso_acumulado(" + peso_acumulado + "kg) |");
+            //System.out.println(transporte.get(i).toString());
+            for (int j = 0; j < vecPaquetes.length; ++j) {
+                if (vecPaquetes[j] == i) {
+                    peso_acumulado += paquetes.get(j).getPeso();
+                    System.out.print(" Paquete: " + j + "Peso(" + paquetes.get(j).getPeso() + "kg), Peso_acumulado(" + peso_acumulado + "kg) |");
+                    //System.out.println(paquetes.get(j).toString());
+                }
+            }
+            System.out.print(" Peso libre " + vecOfertas[i] + "kg |");
+        }
+    }
 
+	//IMPRIMIR ORIGINAL
     public void imprimir(Paquetes paquetes, Transporte transporte) {
         for (int i = 0; i < vecOfertas.length; ++i) {
             System.out.println("Oferta: " + i + " peso libre " + vecOfertas[i]);

From 79117b8a5c1749f9cba70a62c801cfe1e50b76a9 Mon Sep 17 00:00:00 2001
From: "lluc.santamaria" <lluc.santamaria@estudiantat.upc.edu>
Date: Sun, 13 Oct 2024 17:33:30 +0200
Subject: [PATCH 05/16] modificacion tonta

---
 fichero_tonto.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fichero_tonto.txt b/fichero_tonto.txt
index a19abfe..26b670c 100644
--- a/fichero_tonto.txt
+++ b/fichero_tonto.txt
@@ -1 +1 @@
-Hola
+Adeu
\ No newline at end of file

From b59fa7c89ceacdf9f8cd6194f85c49d705933fa5 Mon Sep 17 00:00:00 2001
From: pacopua <113210040+pacopua@users.noreply.github.com>
Date: Sun, 13 Oct 2024 18:04:41 +0200
Subject: [PATCH 06/16] Added class GoalTest.java

---
 src/com/lluc/practicaIA1/GoalTest.java | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/com/lluc/practicaIA1/GoalTest.java

diff --git a/src/com/lluc/practicaIA1/GoalTest.java b/src/com/lluc/practicaIA1/GoalTest.java
new file mode 100644
index 0000000..62c8359
--- /dev/null
+++ b/src/com/lluc/practicaIA1/GoalTest.java
@@ -0,0 +1,7 @@
+public class GoalTest{
+
+    public boolean isGoalState(Object state){
+
+        return false;
+    }
+}
\ No newline at end of file

From 36662bf25da90ff2d440b6511f74c97ea020ea22 Mon Sep 17 00:00:00 2001
From: "lluc.santamaria" <lluc.santamaria@estudiantat.upc.edu>
Date: Sun, 13 Oct 2024 18:09:00 +0200
Subject: [PATCH 07/16] Main completo

---
 src/com/lluc/practicaIA1/Main.java | 62 ++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/com/lluc/practicaIA1/Main.java b/src/com/lluc/practicaIA1/Main.java
index 4cbb857..e607151 100644
--- a/src/com/lluc/practicaIA1/Main.java
+++ b/src/com/lluc/practicaIA1/Main.java
@@ -4,9 +4,11 @@
 import IA.Azamon.Paquetes;
 import IA.Azamon.Transporte;
 
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
+import java.util.*;
+
+import aima.search.framework.*;
+import aima.search.informed.HillClimbingSearch;
+import aima.search.informed.SimulatedAnnealingSearch;
 
 public class Main {
     public static void main(String[] args) {
@@ -24,5 +26,59 @@ public int compare(Paquete p1, Paquete p2) {
             }
         });
         Estado inicial = new Estado(paquetes, transporte);
+        azamonHillClimbingSearch(inicial);
+        azamonSimulatedAnnealingSearch(inicial);
+    }
+
+    private static void azamonHillClimbingSearch(Estado estado) {
+        System.out.println("\nAzamon HillClimbing  -->");
+        try {
+            SuccessorFunction successorFunction = new SuccessorFunction();
+            GoalTest goalTest = new GoalTest();
+            HeuristicFunction1 heuristicFunction1 = new HeuristicFunction1();
+            Problem problem =  new Problem(estado, successorFunction, goalTest, heuristicFunction1);
+            Search search =  new HillClimbingSearch();
+            SearchAgent agent = new SearchAgent(problem,search);
+
+            System.out.println();
+            printActions(agent.getActions());
+            printInstrumentation(agent.getInstrumentation());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void azamonSimulatedAnnealingSearch(Estado estado) {
+        try {
+            SuccessorFunctionSA successorFunction = new SuccessorFunctionSA();
+            GoalTest goalTest = new GoalTest();
+            HeuristicFunction1 heuristicFunction1 = new HeuristicFunction1();
+            Problem problem =  new Problem(estado, successorFunction, goalTest, heuristicFunction1);
+            Search search = new SimulatedAnnealingSearch(2000,100,5,0.001);
+            SearchAgent agent = new SearchAgent(problem, search);
+
+            System.out.println();
+            printActions(agent.getActions());
+            printInstrumentation(agent.getInstrumentation());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void printInstrumentation(Properties properties) {
+        Iterator keys = properties.keySet().iterator();
+        while (keys.hasNext()) {
+            String key = (String) keys.next();
+            String property = properties.getProperty(key);
+            System.out.println(key + " : " + property);
+        }
+
+    }
+
+    private static void printActions(List actions) {
+        for (int i = 0; i < actions.size(); i++) {
+            String action = (String) actions.get(i);
+            System.out.println(action);
+        }
     }
 }

From 7c8529d65e5ef3662ddd4fa108349144fd7e2891 Mon Sep 17 00:00:00 2001
From: "lluc.santamaria" <lluc.santamaria@estudiantat.upc.edu>
Date: Sun, 13 Oct 2024 18:15:45 +0200
Subject: [PATCH 08/16] Main completo

---
 src/com/lluc/practicaIA1/Main.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/lluc/practicaIA1/Main.java b/src/com/lluc/practicaIA1/Main.java
index e607151..785daa2 100644
--- a/src/com/lluc/practicaIA1/Main.java
+++ b/src/com/lluc/practicaIA1/Main.java
@@ -26,6 +26,7 @@ public int compare(Paquete p1, Paquete p2) {
             }
         });
         Estado inicial = new Estado(paquetes, transporte);
+        // Seleccionar uno
         azamonHillClimbingSearch(inicial);
         azamonSimulatedAnnealingSearch(inicial);
     }

From cc4e76875a6dda0d1ba567dc1d0661d0a144b99f Mon Sep 17 00:00:00 2001
From: "lluc.santamaria" <lluc.santamaria@estudiantat.upc.edu>
Date: Sun, 13 Oct 2024 18:26:46 +0200
Subject: [PATCH 09/16] Cambio nombres

---
 src/com/lluc/practicaIA1/GoalTest.java |  2 ++
 src/com/lluc/practicaIA1/Main.java     | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/com/lluc/practicaIA1/GoalTest.java b/src/com/lluc/practicaIA1/GoalTest.java
index 62c8359..e9c5639 100644
--- a/src/com/lluc/practicaIA1/GoalTest.java
+++ b/src/com/lluc/practicaIA1/GoalTest.java
@@ -1,3 +1,5 @@
+package com.lluc.practicaIA1;
+
 public class GoalTest{
 
     public boolean isGoalState(Object state){
diff --git a/src/com/lluc/practicaIA1/Main.java b/src/com/lluc/practicaIA1/Main.java
index 785daa2..f75828b 100644
--- a/src/com/lluc/practicaIA1/Main.java
+++ b/src/com/lluc/practicaIA1/Main.java
@@ -34,9 +34,9 @@ public int compare(Paquete p1, Paquete p2) {
     private static void azamonHillClimbingSearch(Estado estado) {
         System.out.println("\nAzamon HillClimbing  -->");
         try {
-            SuccessorFunction successorFunction = new SuccessorFunction();
-            GoalTest goalTest = new GoalTest();
-            HeuristicFunction1 heuristicFunction1 = new HeuristicFunction1();
+            AzamonSuccessorFunction successorFunction = new AzamonSuccessorFunction();
+            AzamonGoalTest goalTest = new AzamonGoalTest();
+            AzamonHeuristicFunction1 heuristicFunction1 = new AzamonHeuristicFunction1();
             Problem problem =  new Problem(estado, successorFunction, goalTest, heuristicFunction1);
             Search search =  new HillClimbingSearch();
             SearchAgent agent = new SearchAgent(problem,search);
@@ -51,9 +51,9 @@ private static void azamonHillClimbingSearch(Estado estado) {
 
     private static void azamonSimulatedAnnealingSearch(Estado estado) {
         try {
-            SuccessorFunctionSA successorFunction = new SuccessorFunctionSA();
-            GoalTest goalTest = new GoalTest();
-            HeuristicFunction1 heuristicFunction1 = new HeuristicFunction1();
+            AzamonSuccessorFunctionSA successorFunction = new AzamonSuccessorFunctionSA();
+            AzamonGoalTest goalTest = new AzamonGoalTest();
+            AzamonHeuristicFunction1 heuristicFunction1 = new AzamonHeuristicFunction1();
             Problem problem =  new Problem(estado, successorFunction, goalTest, heuristicFunction1);
             Search search = new SimulatedAnnealingSearch(2000,100,5,0.001);
             SearchAgent agent = new SearchAgent(problem, search);

From 8629360fbd03e8b8b7ac8c42a87a3dd3f6b1091f Mon Sep 17 00:00:00 2001
From: "lluc.santamaria" <lluc.santamaria@estudiantat.upc.edu>
Date: Sun, 13 Oct 2024 18:28:32 +0200
Subject: [PATCH 10/16] Cambio nombres

---
 src/com/lluc/practicaIA1/Estado.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/lluc/practicaIA1/Estado.java b/src/com/lluc/practicaIA1/Estado.java
index f6ac93c..00c024b 100644
--- a/src/com/lluc/practicaIA1/Estado.java
+++ b/src/com/lluc/practicaIA1/Estado.java
@@ -62,7 +62,7 @@ public double heuristicoCoste() {
         return -coste;
     }
 
-    public double heuristicoCoseFelicidad() {
+    public double heuristicoCosteFelicidad() {
         return felicidad - coste;
     }
 

From 48eebc0967845e492f820287f0d175f00490ab91 Mon Sep 17 00:00:00 2001
From: "verenisse.famara.caceres"
 <verenisse.famara.caceres@estudiantat.upc.edu>
Date: Sun, 13 Oct 2024 18:54:51 +0200
Subject: [PATCH 11/16] Successor Functions

---
 .../practicaIA1/AzamonSuccessorFunction.java  | 26 +++++++++++
 .../AzamonSuccessorFunctionSA.java            | 43 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
 create mode 100644 src/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.java

diff --git a/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
new file mode 100644
index 0000000..e50eec9
--- /dev/null
+++ b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
@@ -0,0 +1,26 @@
+package com.lluc.practicaIA1;
+import IA.Azamon.Paquetes;
+import IA.Azamon.Transporte;
+import IA.probTSP.ProbTSPBoard;
+import aima.search.framework.Successor;
+
+import java.util.*;
+
+public class AzamonSuccessorFunction /*implements SuccessorFunction*/ {
+    public List getSuccessors(Paquetes paquetes, Transporte transporte) {
+        ArrayList                retVal = new ArrayList();
+
+        for (int i = 0; i < paquetes.size(); i++) {
+            for (int j = i + 1; j < paquetes.size(); j++) {
+                Estado newState = new Estado(paquetes, transporte);
+
+                if(newState.swap(i, j, paquetes, transporte)){
+                    String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toString());
+                    retVal.add(new Successor(S, newState));
+                }
+            }
+        }
+
+        return retVal;
+    }
+}
diff --git a/src/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.java b/src/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.java
new file mode 100644
index 0000000..778e0e8
--- /dev/null
+++ b/src/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.java
@@ -0,0 +1,43 @@
+package com.lluc.practicaIA1;
+
+import IA.Azamon.Paquetes;
+import IA.Azamon.Transporte;
+import IA.probTSP.ProbTSPBoard;
+import IA.probTSP.ProbTSPHeuristicFunction;
+import aima.search.framework.Successor;
+import aima.search.framework.SuccessorFunction;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+public class AzamonSuccessorFunctionSA /*implements SuccessorFunction*/  {
+    public List getSuccessors(int npaq, Paquetes paquetes, Transporte transporte) {
+        ArrayList retVal = new ArrayList();
+        //ProbTSPHeuristicFunction TSPHF  = new ProbTSPHeuristicFunction();
+        Random myRandom=new Random();
+        int i,j;
+
+        // Nos ahorramos generar todos los sucesores escogiendo un par de paquetes al azar
+
+        i=myRandom.nextInt(npaq);
+
+        do{
+            j=myRandom.nextInt(npaq);
+        } while (i==j);
+
+
+        //ProbTSPBoard newBoard = new ProbTSPBoard(board.getNCities(), board.getPath(), board.getDists());
+        Estado newState = new Estado(paquetes, transporte);
+
+        if(newState.swap(i, j, paquetes, transporte)) {
+
+            //double   v = TSPHF.getHeuristicValue(newBoard);
+            String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toString());
+
+            retVal.add(new Successor(S, newState));
+        }
+
+        return retVal;
+    }
+}

From f4482596c241fd449fcf6226c13ea53a90e0fb03 Mon Sep 17 00:00:00 2001
From: Adria Cebrian Ruiz <adrisworking@gmail.com>
Date: Wed, 16 Oct 2024 17:34:04 +0200
Subject: [PATCH 12/16] Asignacion de subclases

---
 practicaIA1.iml                               |  3 +-
 .../{GoalTest.java => AzamonGoalTest.java}    |  4 +-
 .../practicaIA1/AzamonHeuristicFunction1.java | 11 ++++
 .../practicaIA1/AzamonHeuristicFunction2.java | 11 ++++
 .../practicaIA1/AzamonSuccessorFunction.java  | 22 +++++--
 .../AzamonSuccessorFunctionSA.java            |  4 +-
 src/com/lluc/practicaIA1/Estado.java          | 60 ++++++++++++++-----
 src/com/lluc/practicaIA1/Main.java            |  6 +-
 8 files changed, 93 insertions(+), 28 deletions(-)
 rename src/com/lluc/practicaIA1/{GoalTest.java => AzamonGoalTest.java} (54%)
 create mode 100644 src/com/lluc/practicaIA1/AzamonHeuristicFunction1.java
 create mode 100644 src/com/lluc/practicaIA1/AzamonHeuristicFunction2.java

diff --git a/practicaIA1.iml b/practicaIA1.iml
index 35a07c1..3a747d0 100644
--- a/practicaIA1.iml
+++ b/practicaIA1.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="AIMA" level="project" />
-    <orderEntry type="library" name="Azamon" level="project" />
+    <orderEntry type="library" name="llibreries" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/com/lluc/practicaIA1/GoalTest.java b/src/com/lluc/practicaIA1/AzamonGoalTest.java
similarity index 54%
rename from src/com/lluc/practicaIA1/GoalTest.java
rename to src/com/lluc/practicaIA1/AzamonGoalTest.java
index e9c5639..729e894 100644
--- a/src/com/lluc/practicaIA1/GoalTest.java
+++ b/src/com/lluc/practicaIA1/AzamonGoalTest.java
@@ -1,6 +1,8 @@
 package com.lluc.practicaIA1;
 
-public class GoalTest{
+import aima.search.framework.GoalTest;
+
+public class AzamonGoalTest implements GoalTest {
 
     public boolean isGoalState(Object state){
 
diff --git a/src/com/lluc/practicaIA1/AzamonHeuristicFunction1.java b/src/com/lluc/practicaIA1/AzamonHeuristicFunction1.java
new file mode 100644
index 0000000..7187a65
--- /dev/null
+++ b/src/com/lluc/practicaIA1/AzamonHeuristicFunction1.java
@@ -0,0 +1,11 @@
+package com.lluc.practicaIA1;
+
+import aima.search.framework.HeuristicFunction;
+
+public class AzamonHeuristicFunction1 implements HeuristicFunction{
+    public double getHeuristicValue(Object o) {
+        Estado estado = (Estado) o;
+        return estado.heuristicoCoste();
+        //return estado.heuristicoCosteFelicidad();
+    }
+}
diff --git a/src/com/lluc/practicaIA1/AzamonHeuristicFunction2.java b/src/com/lluc/practicaIA1/AzamonHeuristicFunction2.java
new file mode 100644
index 0000000..efc3620
--- /dev/null
+++ b/src/com/lluc/practicaIA1/AzamonHeuristicFunction2.java
@@ -0,0 +1,11 @@
+package com.lluc.practicaIA1;
+
+import aima.search.framework.HeuristicFunction;
+
+public class AzamonHeuristicFunction2 implements HeuristicFunction{
+    public double getHeuristicValue(Object o) {
+        Estado estado = (Estado) o;
+        //return estado.heuristicoCoste();
+        return estado.heuristicoCosteFelicidad();
+    }
+}
\ No newline at end of file
diff --git a/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
index e50eec9..6dd8eec 100644
--- a/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
+++ b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
@@ -3,23 +3,35 @@
 import IA.Azamon.Transporte;
 import IA.probTSP.ProbTSPBoard;
 import aima.search.framework.Successor;
+import aima.search.framework.SuccessorFunction;
 
 import java.util.*;
 
-public class AzamonSuccessorFunction /*implements SuccessorFunction*/ {
-    public List getSuccessors(Paquetes paquetes, Transporte transporte) {
+public class AzamonSuccessorFunction implements SuccessorFunction {
+    public List getSuccessors(Object a) {
         ArrayList                retVal = new ArrayList();
-
+        Estado estado_actual = (Estado) a;
+        Paquetes paquetes = estado_actual.get_paquetes();
+        Transporte transporte = estado_actual.get_transporte();
         for (int i = 0; i < paquetes.size(); i++) {
             for (int j = i + 1; j < paquetes.size(); j++) {
-                Estado newState = new Estado(paquetes, transporte);
+                Estado newState = new Estado(estado_actual);
 
-                if(newState.swap(i, j, paquetes, transporte)){
+                if(newState.swap(i, j)){
                     String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toString());
                     retVal.add(new Successor(S, newState));
                 }
             }
         }
+        for (int i = 0; i < paquetes.size(); ++i) {
+            for (int j = 0; j < transporte.size(); ++j) {
+                Estado newState = new Estado(estado_actual);
+                if(newState.moure_paquete(i, j)) {
+                    String S = "MOVIDO paquete: " + i + " a la oferta " + j;
+                    retVal.add(new Successor(S, newState));
+                }
+            }
+        }
 
         return retVal;
     }
diff --git a/src/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.java b/src/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.java
index 778e0e8..fc1518f 100644
--- a/src/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.java
+++ b/src/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.java
@@ -28,9 +28,9 @@ public List getSuccessors(int npaq, Paquetes paquetes, Transporte transporte) {
 
 
         //ProbTSPBoard newBoard = new ProbTSPBoard(board.getNCities(), board.getPath(), board.getDists());
-        Estado newState = new Estado(paquetes, transporte);
+        Estado newState = new Estado();
 
-        if(newState.swap(i, j, paquetes, transporte)) {
+        if(newState.swap(i, j)) {
 
             //double   v = TSPHF.getHeuristicValue(newBoard);
             String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toString());
diff --git a/src/com/lluc/practicaIA1/Estado.java b/src/com/lluc/practicaIA1/Estado.java
index 00c024b..baf0baa 100644
--- a/src/com/lluc/practicaIA1/Estado.java
+++ b/src/com/lluc/practicaIA1/Estado.java
@@ -10,12 +10,15 @@
 
 
 public class Estado {
-    int vecPaquetes[];
-    double vecOfertas[];
-    double coste = 0;
-    double felicidad = 0;
+	public static Paquetes paquetes;
+	public static Transporte transporte;
+	public int vecPaquetes[];
+	public double vecOfertas[];
+	public double coste = 0;
+	public double felicidad = 0;
 
-    Estado(Paquetes paquetes, Transporte transporte) {
+    Estado() {
+		//Seguramente esto esta mal, pero hace el apanyo, ya veremos
         vecPaquetes = new int[paquetes.size()];
         vecOfertas = new double[transporte.size()];
 
@@ -23,11 +26,36 @@ public class Estado {
             vecOfertas[i] = transporte.get(i).getPesomax();
         }
 
-        generarSolucion1(paquetes, transporte);
-        imprimir(paquetes, transporte);
+        generarSolucion1();
+        imprimir();
     }
 
-    void generarSolucion1(Paquetes paquetes, Transporte transporte) {
+	Estado(Estado a) {
+		//Seguramente esto esta mal, pero hace el apanyo, ya veremos
+		vecPaquetes = new int[paquetes.size()];
+		int n_paquetes = paquetes.size();
+		for (int i = 0; i < n_paquetes; ++i) {
+			this.vecPaquetes[i] = a.vecPaquetes[i];
+		}
+		int n_ofertas = transporte.size();
+		for(int i = 0; i < n_ofertas; ++i) {
+			this.vecOfertas[i] = a.vecOfertas[i];
+		}
+		vecOfertas = new double[transporte.size()];
+
+		for (int i = 0; i < transporte.size(); ++i) {
+			vecOfertas[i] = transporte.get(i).getPesomax();
+		}
+
+		generarSolucion1();
+		imprimir();
+	}
+
+	public Paquetes get_paquetes() {return paquetes;}
+	public Transporte get_transporte() {return transporte;}
+
+
+    void generarSolucion1() {
         int iOferta = 0;
         int iPaquete = 0;
         Oferta oferta = transporte.get(iOferta);
@@ -66,15 +94,15 @@ public double heuristicoCosteFelicidad() {
         return felicidad - coste;
     }
 
-    public boolean moure_paquete(int ip, int oferta_desti, Paquetes paquetes, Transporte ofertas) {
+    public boolean moure_paquete(int ip, int oferta_desti) {
     	Paquete p = paquetes.get(ip);
     	double peso_paquete = p.getPeso();
     	
     	vecOfertas[vecPaquetes[ip]] += peso_paquete;
     	vecOfertas[oferta_desti] -= peso_paquete;
     	
-    	Oferta oferta_des = ofertas.get(oferta_desti);
-    	Oferta oferta_og = ofertas.get(vecPaquetes[ip]);
+    	Oferta oferta_des = transporte.get(oferta_desti);
+    	Oferta oferta_og = transporte.get(vecPaquetes[ip]);
     	
     	if (oferta_des.getPesomax() < vecOfertas[oferta_desti]) return false;
     
@@ -129,7 +157,7 @@ else if(p.getPrioridad() == Paquete.PR3) {
     	
     }
     
-    public boolean swap(int paquete_1, int paquete_2, Paquetes paquetes, Transporte ofertas) {
+    public boolean swap(int paquete_1, int paquete_2) {
     	int ofertap1 = vecPaquetes[paquete_1];
     	int ofertap2 = vecPaquetes[paquete_2];
     	
@@ -139,8 +167,8 @@ public boolean swap(int paquete_1, int paquete_2, Paquetes paquetes, Transporte
     	vecOfertas[ofertap1] += peso_paquete1 - peso_paquete2;
     	vecOfertas[ofertap2] -= peso_paquete1 - peso_paquete2;
     	
-    	Oferta oferta1 = ofertas.get(ofertap1);
-    	Oferta oferta2 = ofertas.get(ofertap2);
+    	Oferta oferta1 = transporte.get(ofertap1);
+    	Oferta oferta2 = transporte.get(ofertap2);
     	
     	if (oferta1.getPesomax() < vecOfertas[ofertap1]) return false;
     	if (oferta2.getPesomax() < vecOfertas[ofertap2]) return false;
@@ -242,7 +270,7 @@ else if(paquete2.getPrioridad() == Paquete.PR3) {
     }
 
     //IMPRIMIR COMO TABLA
-    public void imprimir_tabla(Paquetes paquetes, Transporte transporte) {
+    public void imprimir_tabla() {
         for (int i = 0; i < vecOfertas.length; ++i) {
             double peso_acumulado = 0.00;
             System.out.println("---------------------------------------------------------------------------------------------------------");
@@ -260,7 +288,7 @@ public void imprimir_tabla(Paquetes paquetes, Transporte transporte) {
     }
 
 	//IMPRIMIR ORIGINAL
-    public void imprimir(Paquetes paquetes, Transporte transporte) {
+    public void imprimir() {
         for (int i = 0; i < vecOfertas.length; ++i) {
             System.out.println("Oferta: " + i + " peso libre " + vecOfertas[i]);
             System.out.println(transporte.get(i).toString());
diff --git a/src/com/lluc/practicaIA1/Main.java b/src/com/lluc/practicaIA1/Main.java
index f75828b..c90258e 100644
--- a/src/com/lluc/practicaIA1/Main.java
+++ b/src/com/lluc/practicaIA1/Main.java
@@ -12,7 +12,6 @@
 
 public class Main {
     public static void main(String[] args) {
-
         int npaq = 5;
         int seed = 1;
         double ratio = 2;
@@ -25,7 +24,10 @@ public int compare(Paquete p1, Paquete p2) {
                 return p1.getPrioridad() - p2.getPrioridad();
             }
         });
-        Estado inicial = new Estado(paquetes, transporte);
+        Estado inicial = new Estado();
+        Estado.paquetes = paquetes;
+        Estado.transporte = transporte;
+
         // Seleccionar uno
         azamonHillClimbingSearch(inicial);
         azamonSimulatedAnnealingSearch(inicial);

From de5c75ba645f665f0bdd7503b9e9b32dc5eb9f5e Mon Sep 17 00:00:00 2001
From: Adria Cebrian Ruiz <adrisworking@gmail.com>
Date: Wed, 16 Oct 2024 18:45:33 +0200
Subject: [PATCH 13/16] Probando que funciona el heuristico

---
 .../practicaIA1/AzamonSuccessorFunction.java  |  2 +-
 src/com/lluc/practicaIA1/Estado.java          | 29 +++++++++++--------
 src/com/lluc/practicaIA1/Main.java            | 23 +++++++++------
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
index 6dd8eec..c52c189 100644
--- a/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
+++ b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
@@ -27,7 +27,7 @@ public List getSuccessors(Object a) {
             for (int j = 0; j < transporte.size(); ++j) {
                 Estado newState = new Estado(estado_actual);
                 if(newState.moure_paquete(i, j)) {
-                    String S = "MOVIDO paquete: " + i + " a la oferta " + j;
+                    String S = "MOVIDO paquete: " + i + " a la oferta " + j + newState.toString();
                     retVal.add(new Successor(S, newState));
                 }
             }
diff --git a/src/com/lluc/practicaIA1/Estado.java b/src/com/lluc/practicaIA1/Estado.java
index baf0baa..a449100 100644
--- a/src/com/lluc/practicaIA1/Estado.java
+++ b/src/com/lluc/practicaIA1/Estado.java
@@ -38,17 +38,12 @@ public class Estado {
 			this.vecPaquetes[i] = a.vecPaquetes[i];
 		}
 		int n_ofertas = transporte.size();
+		vecOfertas = new double[n_ofertas];
 		for(int i = 0; i < n_ofertas; ++i) {
 			this.vecOfertas[i] = a.vecOfertas[i];
 		}
-		vecOfertas = new double[transporte.size()];
-
-		for (int i = 0; i < transporte.size(); ++i) {
-			vecOfertas[i] = transporte.get(i).getPesomax();
-		}
-
-		generarSolucion1();
-		imprimir();
+		this.coste = a.coste;
+		this.felicidad = a.felicidad;
 	}
 
 	public Paquetes get_paquetes() {return paquetes;}
@@ -87,17 +82,20 @@ else if (paquete.getPrioridad() == Paquete.PR3 && oferta.getDias() < 4) {
     }
 
     public double heuristicoCoste() {
-        return -coste;
+        return +coste;
     }
 
     public double heuristicoCosteFelicidad() {
-        return felicidad - coste;
+        return -felicidad + coste;
     }
 
     public boolean moure_paquete(int ip, int oferta_desti) {
     	Paquete p = paquetes.get(ip);
     	double peso_paquete = p.getPeso();
-    	
+
+		//si intenta moure a la mateixa oferta retorna error
+		if (vecPaquetes[ip] == oferta_desti) return false;
+
     	vecOfertas[vecPaquetes[ip]] += peso_paquete;
     	vecOfertas[oferta_desti] -= peso_paquete;
     	
@@ -160,7 +158,10 @@ else if(p.getPrioridad() == Paquete.PR3) {
     public boolean swap(int paquete_1, int paquete_2) {
     	int ofertap1 = vecPaquetes[paquete_1];
     	int ofertap2 = vecPaquetes[paquete_2];
-    	
+
+		//si la asignació d'oferta es la mateixa per els dos paquets no la contemplem
+		if(ofertap1 == ofertap2) return false;
+
     	double peso_paquete1 = paquetes.get(paquete_1).getPeso();
     	double peso_paquete2 = paquetes.get(paquete_2).getPeso();
     	
@@ -300,4 +301,8 @@ public void imprimir() {
             }
         }
     }
+	public String toString() {
+		String s = "coste: " + coste;
+		return s;
+	}
 }
diff --git a/src/com/lluc/practicaIA1/Main.java b/src/com/lluc/practicaIA1/Main.java
index c90258e..4679c73 100644
--- a/src/com/lluc/practicaIA1/Main.java
+++ b/src/com/lluc/practicaIA1/Main.java
@@ -12,12 +12,19 @@
 
 public class Main {
     public static void main(String[] args) {
-        int npaq = 5;
-        int seed = 1;
-        double ratio = 2;
+        System.out.println("introduce el número de paquetes");
+        Scanner scanner = new Scanner(System.in);
+        int npaq = scanner.nextInt();
+        System.out.println("introduce la semilla");
+        scanner = new Scanner(System.in);
+        int seed = scanner.nextInt();
+        System.out.println("introduce el ratio");
+        scanner = new Scanner(System.in);
+        double ratio = scanner.nextDouble();
         Paquetes paquetes = new Paquetes(npaq, seed);
         Transporte transporte = new Transporte(paquetes, ratio, seed);
-
+        Estado.paquetes = paquetes;
+        Estado.transporte = transporte;
         paquetes.sort(new Comparator<Paquete>() {
             @Override
             public int compare(Paquete p1, Paquete p2) {
@@ -25,12 +32,10 @@ public int compare(Paquete p1, Paquete p2) {
             }
         });
         Estado inicial = new Estado();
-        Estado.paquetes = paquetes;
-        Estado.transporte = transporte;
 
         // Seleccionar uno
         azamonHillClimbingSearch(inicial);
-        azamonSimulatedAnnealingSearch(inicial);
+        //azamonSimulatedAnnealingSearch(inicial);
     }
 
     private static void azamonHillClimbingSearch(Estado estado) {
@@ -50,7 +55,7 @@ private static void azamonHillClimbingSearch(Estado estado) {
             e.printStackTrace();
         }
     }
-
+    /*
     private static void azamonSimulatedAnnealingSearch(Estado estado) {
         try {
             AzamonSuccessorFunctionSA successorFunction = new AzamonSuccessorFunctionSA();
@@ -67,7 +72,7 @@ private static void azamonSimulatedAnnealingSearch(Estado estado) {
             e.printStackTrace();
         }
     }
-
+    */
     private static void printInstrumentation(Properties properties) {
         Iterator keys = properties.keySet().iterator();
         while (keys.hasNext()) {

From dedaf6a2f7c310163490e6a001c7e28deaab1084 Mon Sep 17 00:00:00 2001
From: Adria Cebrian Ruiz <adrisworking@gmail.com>
Date: Wed, 16 Oct 2024 22:42:24 +0200
Subject: [PATCH 14/16] Continuacion pruebas hill climbing

---
 .../practicaIA1/AzamonSuccessorFunction.java  |  4 +-
 src/com/lluc/practicaIA1/Estado.java          | 47 +++++++++++++++----
 src/com/lluc/practicaIA1/Main.java            | 12 ++++-
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
index c52c189..f1566ff 100644
--- a/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
+++ b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
@@ -18,7 +18,7 @@ public List getSuccessors(Object a) {
                 Estado newState = new Estado(estado_actual);
 
                 if(newState.swap(i, j)){
-                    String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toString());
+                    String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toStringSimple());
                     retVal.add(new Successor(S, newState));
                 }
             }
@@ -27,7 +27,7 @@ public List getSuccessors(Object a) {
             for (int j = 0; j < transporte.size(); ++j) {
                 Estado newState = new Estado(estado_actual);
                 if(newState.moure_paquete(i, j)) {
-                    String S = "MOVIDO paquete: " + i + " a la oferta " + j + newState.toString();
+                    String S = "MOVIDO paquete: " + i + " a la oferta " + j + newState.toStringSimple();
                     retVal.add(new Successor(S, newState));
                 }
             }
diff --git a/src/com/lluc/practicaIA1/Estado.java b/src/com/lluc/practicaIA1/Estado.java
index a449100..25e6ff3 100644
--- a/src/com/lluc/practicaIA1/Estado.java
+++ b/src/com/lluc/practicaIA1/Estado.java
@@ -12,6 +12,7 @@
 public class Estado {
 	public static Paquetes paquetes;
 	public static Transporte transporte;
+	public static double pesos_maximos = 0;
 	public int vecPaquetes[];
 	public double vecOfertas[];
 	public double coste = 0;
@@ -24,7 +25,10 @@ public class Estado {
 
         for (int i = 0; i < transporte.size(); ++i) {
             vecOfertas[i] = transporte.get(i).getPesomax();
-        }
+        	pesos_maximos += transporte.get(i).getPesomax();
+		}
+
+
 
         generarSolucion1();
         imprimir();
@@ -102,7 +106,7 @@ public boolean moure_paquete(int ip, int oferta_desti) {
     	Oferta oferta_des = transporte.get(oferta_desti);
     	Oferta oferta_og = transporte.get(vecPaquetes[ip]);
     	
-    	if (oferta_des.getPesomax() < vecOfertas[oferta_desti]) return false;
+    	if (0 > vecOfertas[oferta_desti]) return false;
     
     	coste += oferta_des.getPrecio()*peso_paquete;
     	coste -= oferta_og.getPrecio()*peso_paquete;
@@ -171,8 +175,8 @@ public boolean swap(int paquete_1, int paquete_2) {
     	Oferta oferta1 = transporte.get(ofertap1);
     	Oferta oferta2 = transporte.get(ofertap2);
     	
-    	if (oferta1.getPesomax() < vecOfertas[ofertap1]) return false;
-    	if (oferta2.getPesomax() < vecOfertas[ofertap2]) return false;
+    	if (0 > vecOfertas[ofertap1]) return false;
+    	if (0 > vecOfertas[ofertap2]) return false;
     	
     	//Calculamos los costes segun el precio de la oferta
     	coste -= oferta1.getPrecio()*peso_paquete1 + oferta2.getPrecio()*peso_paquete2;
@@ -275,7 +279,7 @@ public void imprimir_tabla() {
         for (int i = 0; i < vecOfertas.length; ++i) {
             double peso_acumulado = 0.00;
             System.out.println("---------------------------------------------------------------------------------------------------------");
-            System.out.print("| Oferta: " + i + ", Peso_acumulado(" + peso_acumulado + "kg) |");
+            System.out.print("| Oferta: " + i + " Peso maximo de la oferta: " + transporte.get(i).getPesomax() + ", Peso_acumulado(" + peso_acumulado + "kg) |");
             //System.out.println(transporte.get(i).toString());
             for (int j = 0; j < vecPaquetes.length; ++j) {
                 if (vecPaquetes[j] == i) {
@@ -284,12 +288,15 @@ public void imprimir_tabla() {
                     //System.out.println(paquetes.get(j).toString());
                 }
             }
-            System.out.print(" Peso libre " + vecOfertas[i] + "kg |");
-        }
+            System.out.print("Peso libre " + vecOfertas[i] + "kg |");
+		}
     }
 
 	//IMPRIMIR ORIGINAL
     public void imprimir() {
+		System.out.println("peso maximo: " + pesos_maximos);
+		System.out.println("coste: " + coste);
+
         for (int i = 0; i < vecOfertas.length; ++i) {
             System.out.println("Oferta: " + i + " peso libre " + vecOfertas[i]);
             System.out.println(transporte.get(i).toString());
@@ -302,7 +309,31 @@ public void imprimir() {
         }
     }
 	public String toString() {
-		String s = "coste: " + coste;
+		//String s = "coste: " + coste;
+		String s = "";
+		double peso_libre = 0;
+		for (int i = 0; i < vecOfertas.length; ++i) {
+			double peso_acumulado = 0.00;
+			s += "--------------------------------------------------------------------------------------------------------- \n";
+			s += "| Oferta: " + i + " Peso maximo de la oferta: " + transporte.get(i).getPesomax() + ", Peso_acumulado(" + peso_acumulado + "kg) |";
+			//System.out.println(transporte.get(i).toString());
+			for (int j = 0; j < vecPaquetes.length; ++j) {
+				if (vecPaquetes[j] == i) {
+					peso_acumulado += paquetes.get(j).getPeso();
+					s += " Paquete: " + j + "Peso(" + paquetes.get(j).getPeso() + "kg), Peso_acumulado(" + peso_acumulado + "kg) |";
+					//System.out.println(paquetes.get(j).toString());
+				}
+			}
+			s += " Peso libre " + vecOfertas[i] + "kg |";
+			peso_libre += vecOfertas[i];
+		}
+		s += "peso_libre_total: " + peso_libre + "\n";
+		s += "coste: " + coste + "\n";
 		return s;
 	}
+
+	public String toStringSimple() {
+	String s = "Coste: " + coste;
+	return s;
+	}
 }
diff --git a/src/com/lluc/practicaIA1/Main.java b/src/com/lluc/practicaIA1/Main.java
index 4679c73..49f165e 100644
--- a/src/com/lluc/practicaIA1/Main.java
+++ b/src/com/lluc/practicaIA1/Main.java
@@ -34,6 +34,7 @@ public int compare(Paquete p1, Paquete p2) {
         Estado inicial = new Estado();
 
         // Seleccionar uno
+        inicial.imprimir_tabla();
         azamonHillClimbingSearch(inicial);
         //azamonSimulatedAnnealingSearch(inicial);
     }
@@ -51,6 +52,7 @@ private static void azamonHillClimbingSearch(Estado estado) {
             System.out.println();
             printActions(agent.getActions());
             printInstrumentation(agent.getInstrumentation());
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -78,15 +80,23 @@ private static void printInstrumentation(Properties properties) {
         while (keys.hasNext()) {
             String key = (String) keys.next();
             String property = properties.getProperty(key);
-            System.out.println(key + " : " + property);
+            System.out.println(key + " $ " + property);
         }
 
     }
 
     private static void printActions(List actions) {
+        
         for (int i = 0; i < actions.size(); i++) {
             String action = (String) actions.get(i);
             System.out.println(action);
         }
+
+        /*
+        int n = actions.size() - 1;
+        String action = (String) actions.get(n);
+        System.out.println(action);
+        */
     }
+
 }

From a453a153a3b81fc4ffc041664fa951c9abd2d6e6 Mon Sep 17 00:00:00 2001
From: Adria Cebrian Ruiz <adrisworking@gmail.com>
Date: Wed, 16 Oct 2024 22:42:48 +0200
Subject: [PATCH 15/16] Continuacion pruebas hill climbing

---
 .idea/.gitignore                              |   3 +
 .idea/libraries/llibreries.xml                |  11 ++
 .idea/misc.xml                                |   6 +
 .idea/modules.xml                             |   8 ++
 .idea/uiDesigner.xml                          | 124 ++++++++++++++++++
 .idea/vcs.xml                                 |   6 +
 .../com/lluc/practicaIA1/AzamonGoalTest.class | Bin 0 -> 482 bytes
 .../AzamonHeuristicFunction1.class            | Bin 0 -> 653 bytes
 .../AzamonHeuristicFunction2.class            | Bin 0 -> 662 bytes
 .../practicaIA1/AzamonSuccessorFunction.class | Bin 0 -> 2255 bytes
 .../AzamonSuccessorFunctionSA.class           | Bin 0 -> 1753 bytes
 .../com/lluc/practicaIA1/Estado.class         | Bin 0 -> 7866 bytes
 .../com/lluc/practicaIA1/Main$1.class         | Bin 0 -> 888 bytes
 .../com/lluc/practicaIA1/Main.class           | Bin 0 -> 4408 bytes
 14 files changed, 158 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/libraries/llibreries.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/uiDesigner.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 out/production/practicaIA1/com/lluc/practicaIA1/AzamonGoalTest.class
 create mode 100644 out/production/practicaIA1/com/lluc/practicaIA1/AzamonHeuristicFunction1.class
 create mode 100644 out/production/practicaIA1/com/lluc/practicaIA1/AzamonHeuristicFunction2.class
 create mode 100644 out/production/practicaIA1/com/lluc/practicaIA1/AzamonSuccessorFunction.class
 create mode 100644 out/production/practicaIA1/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.class
 create mode 100644 out/production/practicaIA1/com/lluc/practicaIA1/Estado.class
 create mode 100644 out/production/practicaIA1/com/lluc/practicaIA1/Main$1.class
 create mode 100644 out/production/practicaIA1/com/lluc/practicaIA1/Main.class

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/libraries/llibreries.xml b/.idea/libraries/llibreries.xml
new file mode 100644
index 0000000..f47f9e9
--- /dev/null
+++ b/.idea/libraries/llibreries.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="llibreries">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/llibreries/Azamon.jar!/" />
+      <root url="jar://$PROJECT_DIR$/llibreries/Azamon-javadoc.zip!/" />
+      <root url="jar://$PROJECT_DIR$/llibreries/AIMA.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..e0844bc
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..2fb5ee2
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/practicaIA1.iml" filepath="$PROJECT_DIR$/practicaIA1.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/AzamonGoalTest.class b/out/production/practicaIA1/com/lluc/practicaIA1/AzamonGoalTest.class
new file mode 100644
index 0000000000000000000000000000000000000000..afcb99b2eac698d39df82b0a67853d4271a91b71
GIT binary patch
literal 482
zcma)2Jxc>Y6r8<$ocYjbVp0ksLSo@!qeVmrf+8GRB&4u=Sy!|1?pE$D3jQV=E5X7a
z;ExjDCJ|8^o0*+AJ8$2<_m9^%00(H5kwe`_!^gUhra<w~#3nlu$hA8|f&8(((gL->
z#QJ<1jdU`gQOK2gU=@W!N{rKsVm=$2RA4($Hj-gDRq`$&l^I26y*=4`q{zmnmcoHf
zv#vnJq)zoS%D7{*9Zcw+WJvLiyckWi%DSCPfkHa>>wj&5a^Fr9rB95TsqyoLUDvLP
z0*V4#|CmT%_4fb*8)PDqsis7Y<#j@lez3`{{Q3np;qeA}QM^u%nO|e{SxIKWT-bSm
zc%IoyjLzmFN{rRTxr_=c!Frj|h4+~~W-s^T5Z}qtEZLg7m?zzh71TJxf0*50`vk8_
BXMF$w

literal 0
HcmV?d00001

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/AzamonHeuristicFunction1.class b/out/production/practicaIA1/com/lluc/practicaIA1/AzamonHeuristicFunction1.class
new file mode 100644
index 0000000000000000000000000000000000000000..0867d26fdf8c9fd117aec05132e426bd896f7c1b
GIT binary patch
literal 653
zcmZ`%TQ37a6#iy=Syo+I>R#c=-K0+*h(uaKvUnhUpKgZ^yF0QM5`Rj(ka!T!ev~-V
z;(<1soHOTqv)^|v^YQum24EWt4sw{ZG3CI*w2c`Xvo_`!^1CWj$sR*yWwpVOt?8Cz
z7<E-BPt%|&qYKgWDN}N_C;Wzpl!?ES*`%#v2JU(~;J%-F{5BF^qC9cDU*-D`BGBQH
zOd}Oj?l27r(qVOnp?D>eU!WoUloZM<?zOlR+!x^$KWkn~FWFhGGcaw`|3Or`j1$o!
zw9;GupaYYdbFS0KlZVPQQt4OLmXRpH#sI@y&xX2$1<a$uu-WrUKXQh#za20v3l#_+
zOA&c(ei?~C-s|Xw{|@G7VziI;&lGh{#|gDT>#Ac3Sz0Sif_7|?r`pL5QpCwK^0~Da
zu%`~}kj;0K7@~9G`&_^<MGPYtC2M|mi7Z3jS$~Ihvhj?}BSjVrgLyw7p&UsWmc{N(
XVlylTA48FNa`crj-YIK>@)pWp9qO5=

literal 0
HcmV?d00001

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/AzamonHeuristicFunction2.class b/out/production/practicaIA1/com/lluc/practicaIA1/AzamonHeuristicFunction2.class
new file mode 100644
index 0000000000000000000000000000000000000000..317f169f1ce51aaae71002d128efa2d5c5869aff
GIT binary patch
literal 662
zcmZ`%OD_aL5dM00*D%&&*ZZ-;$y<ku1Ca<eB!dIldv9;E&CImSgT$W_7ZL|?_M=4g
zE)J|rQq@&o&G%JR_xs1oD}YVRcqm}h#h3>N<1Qv#OuCq2=-SqiPInk`3yU>|{GMqj
zh5=tk>Ld&6Dn1wWfHGy@ND<UTtZn?2%%@GAFmPX*kOx5~`AsZjs--yEUFW;^A~eyV
z%3_^Ru9`&znP_8+p>(OzAD||Jj1)!|{3~%Qcp#!nep<g$GTmC-XJE#v|ADA=m87CU
zXr;6MK?^1|@62SeR8?&Usr=X0nw2QRMK{A#$AQ{}MNFf@u-dWYKXQh_-xDy*3mpoc
zC=tshzlcSs?o52me-`t-F^2Kx_ZH2bNm5l+ftI=<8m)WV#~ku>zqAs%Y==AzLAHk?
zPM(o3EIorgwqTEJS38MbIv2mrMf6d`(2oJK_Gh2Sa^$_`H#o;DPslw`<iIl6hXfKT
eP^D#=ZC4VTWwH1mO2kv3uZ*EqTf>xhF!Bk}*PSW=

literal 0
HcmV?d00001

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/AzamonSuccessorFunction.class b/out/production/practicaIA1/com/lluc/practicaIA1/AzamonSuccessorFunction.class
new file mode 100644
index 0000000000000000000000000000000000000000..3392fb54222994f3bf396157ded61627939a7ebb
GIT binary patch
literal 2255
zcmai0O>-1g6g_XgdeZhJ5Ex)YV3Z&e2sHQ+G(jK)BBPT8Ga(p=!b_(~n)Gy!-8~?<
z#VS`UTxk_6HdwB7lTc7tR=H6Zt}K6yMTw_pCNrJN05$3Nao>IC-Fwb`-TCvsN523#
zh9wnS@V0_?RK&vmT@?uohRrb*I^GLM?}yD$*bMh_(@6!VRA?9px13gSq~SH%3lXlJ
zRWPRDLxI$B%dvtJ0`Wrsj6h=4T`&cDN|s|z)GG6)H!bIFT6#;aA?+FIS>e2COax1o
zFL1bIxE0;DYldF+q!Cz#ERG!2M{diC>y&GTVfw!7jny13xz4aaX3-2<b^`PjO4sEL
zsoT<7)F<b!n?^9)-!Rnz%hpSlA8?x}hjFw$%YkP(i(E)M=FM^-1ID?lb1Y~5KrXl;
z#&teLJ{BLj9<O;aN%72JM%n_|NDw2QCvP<)$(VJ#D@?W)`lYM#i<%jj%w=n-IMPgA
zKi{<STs82d<5yiT402n<XS!vlSB6;_%j2?ICs@Hb1&mcKyEV@+$E;9@*PcV`;gA;%
zS!@&7Qs<~nT`OvVogGzbFr(oke5|2_aSaog3~|nD_ykiL%9s||blP<TpE*>=&0xu0
z@Ox6Ykj9LLi}+MvkF+XM_f6>;OZqiWR?M5Ox2(4`4)JC+T*74ybC^owGl7AQ;XEfh
zM$p#1p_9P=mz=s*aa4JuCRD0zY>ObEu{f`^_1sqIkEj(<v^(^Rs=8yHXB(2bCVcBQ
zwc{P5ocY2FYqWk1{hP8XkSr97{g(u~1GiD@WvfyRi(o5{YV*;&2P!_tl`z+d>9bR#
zBjcxwlli;|e*)Vpa@ibp9YY2etzd~G7O)erUJE>9BUT4^@*TaV%|jzw*Dfw!BXPN~
zz}pk`Ut485nF{OKT;rI8j8D!K&rIf<qz^G<nYU%$y=HoWWcUiMhJ{ARzIN7@bHiOW
z^+p_x)W&!pUGJ8HYrMlH*IllWM6KvJrZ;L!-w*HSchR7l7>$}fC!Gb`^!pkcha;J7
z%yr$y>04E^gZt$O!dmtbQxjrT+IHCr%wYwK0{b@P*C{rE-7ogT>*(btgN4FRL5w|L
z3v9P@rn499lLuBIey%U?V4JENRpdC<8V-0BJ2~Sk2fNsEbF3RlsI>j_7_r$^#K#Z*
zip0dB6(oleY*RzY_+ToV$|Y8y+{cA%DsgpC$tunH$;U{{9$H0uD4k1ZQ(0vNUEgDG
zILf70pgzJYz);t~V`#Ivu3UN*nH6+jyrYN*&z{^#v3(GQpNiM9lPl=Cj}F+I)?;se
z3HFZzKQXg7LN;bdSja;f8UDISWe=Izgg3DngQWHpi7nA*j<njed0hLFe0@#Ez9nDx
z$k-3qjfdES-)Z}cYk#A!&hA~}&C!21*Sd%_fIQ_&vme77*b9aG=jgkanmlaz-D~-M
z)AIWYvrRuL(o`!P?PHw$Ch^q$C{X?k{y;y^h%=AhZ~zDSPeKk)h<J#49%iP4P@nNw
zMM1BEEec`^5(;z$M_4LP(IZa&izNS^A|{?fTbmN`D0j#377X?(Pn9q+PxRxQcXQ<f
K+D_ElGyelAWH@X9

literal 0
HcmV?d00001

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.class b/out/production/practicaIA1/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.class
new file mode 100644
index 0000000000000000000000000000000000000000..c332a8ed35a2b281a8d4109306babe17c2b5ceca
GIT binary patch
literal 1753
zcmaJ?+j84P82;9lEm^otaGMq<v<)<E?LwopKmofgb=-ssoCC2Zos<h^EpHPgvgAtZ
zhVUeC#Vf!~GSkfP06Y)36#lgpM@(F-(H{Qe_n)jk-@N_<z~^Y0n8Y0&^CnViw@hfb
zqm~67cTMQ(qT`-gJ}D>_9bcHp<4dJb(NWd$fFb+9^<DXhAzdnOGHCUnBN!$ct}j;m
z-L?o@yzLRC&<GsvZSv4n_n4^39XDcFXgERF^1Qxd^+N7Q*Wq^Uu2uVqcLTrKcN`H#
zLAc!aiA983mEqjBkRuM6cv!L<b}d%1*7?i6kRqxkXswX@Q7;IksFoYM{1vzQ()Fx{
z8%eUqnhN58>~VkFYRb^{w~3+oJ^qsTHiJQ@fmw!&3Bx0245l18VYrl#NjRsJg+gv}
zk6|i-qZWqzAO>S}4>q{p3A!Up1E@oq0_)PdOMrZ_-;`WZdasO6;Zh`dCs6q!IcIN$
z_u|Z(&7dDTV%b%-x%$>j&#R2&@h%Ds7fzEl0?ROYN*&_M;~}UWX2zCuh$oM)@Hmee
z7D<0G2xLTg>#Yd66Lg}9Eb0cH<gtWhhHKpIaw`%%bat#4A@7R)Al$P?rB~R#&f_Vl
zKJ#N;zBRTJ?1Or*wReRh8FXL#C~cokTFEYxQ7zi%J%&ulw#&~c<uVwy2K7KG?xSSG
znD_?YQrYa)*3w43wz6oi&CW9QFkJ5PJy8#Qhs$TK+@TXy$CuQ-C9;0D`No)MxK%nU
zn4k>fsH#y+^G=6)EGd7&eXgUS61>hZciQu=|0>uMaqACpF4Hsy;en0~YTHH-?DZ)Z
zdE56zSoe4o2?GCf(nD-xSj(r>#GZ)ehKkh$%y_&Kl>aEU4tipY`1c9<lTZ?**hHOs
zUel#9*Fi&l<4k<xu+a?szZ^cm1pQyCUkXeO1g#h7X3@@Q&)hx&`+dN^NNaXLJdY_l
z=Z6Bggv)eecn?KdNts<o1}4$k$4G4*Azjgqq0u2z$rLj)hsfT~#=Ab1ozj2(=dWYv
z#5XEN(NL5_<bJ`NIu(sWn6L2;P{|d^On$4FD;h^QcZl=PirR1FB@Kn__Q2yLauh;=
z5KYtbA!bm<HQb{xA7KuwxQQQ#qR_t}`Be&dnq+bcYaE9<y^kw{*xI;C+Nl9|mTaU+
za*M29r>{u?>tyi;MLJDmdXqG=#CeQcbfV7-7EmHj2H^tbB=rW<I#N0`_BWm|okY_3
ch*&9nj5XR#a=3!;2vQNB(%qo@XY}6x7rV5&dH?_b

literal 0
HcmV?d00001

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/Estado.class b/out/production/practicaIA1/com/lluc/practicaIA1/Estado.class
new file mode 100644
index 0000000000000000000000000000000000000000..976f788b6b539e05d59009b4874d337f07ad7a9b
GIT binary patch
literal 7866
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
R{km=+*X<L!{f2Iz{6D;L)*1i+

literal 0
HcmV?d00001

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/Main$1.class b/out/production/practicaIA1/com/lluc/practicaIA1/Main$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..b5aec987c18b13e8e29ceeb49ca94f7adf8234f7
GIT binary patch
literal 888
zcmaJ<O>fgc5Ph33H^!k!TM8wV1}M}?E39zoA*E6jfoduJkb-*Qw6Ry|R*oI)H3xnZ
z7cNEOfH?D`5VKAWQ4+AUJ3BMaZ{N($?>|3&0ysv?L<vt#<gsU<VWNm<2A&&uVPK!3
zbRt8kP8src^O~X1i+sVb-j|`cNXJ7Ff8fJ_A{+h4<H0qLrS@mRg1V6jgXM;yh<gD~
z5<%{6-;2gh5Tu?niMgkw$K7t*Ip;FmZ+93BN>6x9q)of;cAf4QK8`}?ihoLl5}g&H
zrpu6<v>7&6Bz5Wy!-3tu<)66|@Nnc@4sV60I?EBwR36At$W^Kpyj_M&BdL;s)60Z%
z6~!kjE<UAN%t4gKo_H^HkIK5l*IEU2@LlKyQ6j_9xllKeZ{VecS2$o;yAX*wixOpF
z4P^^9nhdq2K3J%t#!&xHFBz(fB{OVgp#}L2JOAXNM<0`JhHd-fTsH<PCh;9T6xK+n
zt5`;{^tqo+ii-x#Q3>>zG-G*MR0??}ogA`^Y_atn>>C|&xJSDN15aSlZcPEGV4XZF
z12x+9&u4_zbmrk5a!0iMujI`$>}3p%DQd<*cx+%ZV>Piwr(Cs5tPf_a$As3bmDb@e
t<d10Gp|D6iFRd~oE@C^o{vjS^b_b8i7Eq@`cC$zw_sN=cQIRZte*sbRyNv(<

literal 0
HcmV?d00001

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/Main.class b/out/production/practicaIA1/com/lluc/practicaIA1/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..f19a0209dd18b86b7a32a34fd1bdb1d1253e93e0
GIT binary patch
literal 4408
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
Ef1xy~LI3~&

literal 0
HcmV?d00001


From 655b1c5ebeb16a1ba95693ffdaa5e828550888bb Mon Sep 17 00:00:00 2001
From: Adria Cebrian Ruiz <adrisworking@gmail.com>
Date: Wed, 16 Oct 2024 23:30:31 +0200
Subject: [PATCH 16/16] Hill climbing pinta perfecto

---
 .idea/misc.xml                                |   2 +-
 .../com/lluc/practicaIA1/AzamonGoalTest.class | Bin 482 -> 482 bytes
 .../AzamonHeuristicFunction1.class            | Bin 653 -> 653 bytes
 .../AzamonSuccessorFunctionSA.class           | Bin 1753 -> 1753 bytes
 .../com/lluc/practicaIA1/Estado.class         | Bin 7866 -> 8216 bytes
 .../com/lluc/practicaIA1/Main$1.class         | Bin 888 -> 922 bytes
 .../com/lluc/practicaIA1/Main.class           | Bin 4408 -> 4408 bytes
 .../practicaIA1/AzamonSuccessorFunction.java  |   8 +++++--
 src/com/lluc/practicaIA1/Estado.java          |  22 +++++++++++++-----
 9 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e0844bc..31e1ebc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="openjdk-23" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/AzamonGoalTest.class b/out/production/practicaIA1/com/lluc/practicaIA1/AzamonGoalTest.class
index afcb99b2eac698d39df82b0a67853d4271a91b71..c01779d86edcee2eee9bc4b084c6f4b8022e3713 100644
GIT binary patch
delta 216
zcmaFF{D|4+)W2Q(7#J9w8N|34m>8JZ8CZB2SQ*$D83eKt%M$f-67$ma{gbj%lS>#G
z*laTMGE3|j8JIOR!`K-(Ccak#YT%lz!KgS<{jdasA_F_n3`Pb{pn)J7XbzC%o}9=i
zmdyhc1MwJuqP#$o2g>GS;0N-6)-ecz)B@RNK$;0iGcm6LkwBF&ot$8uVh~vdh)$3S
PAqHWf9!3TcuzFDdWO5eT

delta 216
zcmaFF{D@io)W2Q(7#JAL8N|34m>GoF8HCvxMA#Wb85!7YGV?M^>=+rCH8jH}wjE~W
zVPIuon`omZ%*Y^+l~|UjpOcuEuJ50em6}{KF;!85L6Lz8Xa*w#3(!C&APrOwB-tk?
zGKyt$0L4H&2B0V>kmP}~xfr;CJVqd&7o--*HUrX3K$?kp4Txkw=;Q?J6obezKy-ps
P@G<ZM^#EN3RxbzuB9a!N

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/AzamonHeuristicFunction1.class b/out/production/practicaIA1/com/lluc/practicaIA1/AzamonHeuristicFunction1.class
index 0867d26fdf8c9fd117aec05132e426bd896f7c1b..881a01be5c4aefbc648126f4c58e8650a1328b40 100644
GIT binary patch
delta 296
zcmeBW?Paw*^>5cc1_lOa201PUCI)791{NL$Rt7dk27#=^vPAuy#JqHU|D>$c<Pt^(
zHk-`6%o00B24)S-u*t@ZimF@;><nBy4BQMnj12r4sij4k#U+`^`Of*pC8=O#F6<0^
zlOq`ofCdXpp2MiK(2%j7L6LzMXctfi&|(k`v=2xM0(tsCnh{8|YHep=+z6Hy0+JwU
zpdf=VkmP}~MHobZJVpjF25}$>((D8B0FdU=KES~4tFw)Pb3Ks9!~ik@<T(bQV_6wE
h48X=HK$J2-i~%W-V2}hF#0rE`4ANkC$$+)X0s!!NA=Ur@

delta 293
zcmXYs%TB^T7=_PF8AeM51m)s|z)p~)?u?0HgJC6c=f09gOAI7X-SPxo^hr!vK;pu<
z<{5kz;+aAw`Oklw@61FhQtoE^{R7|@4I2s-jj9cannqpYOygW2dml`KuqR+$wV#te
zDWrq=uB9AY;4)s^lm&`o@6&VNy~(Tl^fLBGVZ7`v3UB_$ESQJEXxg97Lq7#PpoI*L
zh^4EfY8)^gvT~_{syb_kBpus~*<BMk=FUEMaKuU=j{>8){79HZwXc66huswh))z|&
igD_tLofN$crny@s&S1>Eh+~2jPYLDpT_@~Ioc;s$fFhRw

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.class b/out/production/practicaIA1/com/lluc/practicaIA1/AzamonSuccessorFunctionSA.class
index c332a8ed35a2b281a8d4109306babe17c2b5ceca..8ea61dae38b3ad13c00846daddf869a94979ed44 100644
GIT binary patch
delta 756
zcmXw1U31bv6g^8qHpI{tC~8`*lvWGaO0|lLZM7e0qfjVzbnwLq7L{5<hoows_z`(>
zeDD`IV_#sV%=8EN><j<ECuf}T)#_c;WODcH-m~YPyV+i_7i@hwK0E@jf=vxRNF1^b
zKNN<cZR?Gd-m&Z#>0))e_RM8a=IeIdU1X3F$wwS2L!?jIbL%_lrDoIG&(|GS0~b0c
z{!8?;Wy{`byw;#W5@A5cAch$Duw8rSnl_2c2{UPOgc(M?9ve+)2nlWoQ5`37iU`hI
zYnQ>FFwNu>kuY?O5P3n0Yhh~Ptd239^Y*12RUh|0`Qn;}7$!tNlirb(qAAA(9aBhn
z-=r8zc|G6U!PBp7o~$l68m{9ut=&S+ec9M@RNP|-o9mmo^2$<S*(}ClOuT~%Obz$(
zfFmyo7Q6v@$}7nq$hdCWcCERxV>wRE;V60E<%GgfW*GB+$YU)!!F;3fYHt_gNYZJG
z#|LT&3dM^wOVh|`^rt#t2mSOkMUe&uFhf!QOTZ-}gYYaaQ>4vof`l|$t9HRF9R#v+
z7a9RQ>o@$PZEOTHN*@F>JgP+b$KOA@2oWKYRSi|Fv@!f1lL8rP8>bI(2FL~s(uq}!
zfT4B}Z{z%9L;g%<Busn9{&Y*2dQOGc>6cu=90J0^KYIdQ#kIcWDl)j<@4AW`xJmm1
zs3415kP$`+^H`t;MzDrO+MythJGf1Vlj<ztC8$^??Ff9w7~$X?8vBKrRmR0tp(`v-
Ya}_xnRjRl~-(7MA^2Sia1|Gur11@5C%>V!Z

delta 780
zcmYLH-A~g{6#w0>?d@s@b1=0-=J;|OItNZs2O<Ne6vu~1P)tlLGIfX@S&QNm|AM41
z`sBM$8k3Q*#6LjaN%%i}RP@}<#NPCr^E=<?+<O!{3O)XQeDDpxH7x50Bg1h?ha`Ab
zhm4FMLmb08xBwiN1<6H32*-6D25yLeJjW=<7=t=iaVp+8Lm-u2`TC0;vYdgFh%j_)
z*styEwpZEA7HT#7ZK>jV4B`LUCEHoAzA|tV<9qMoX#=+~VW5CX@|vtxJ=d$*TXSXa
zMRnb6S23kw+CUMv{aMzliz0Un%)s)0u-tGf?WXNK&n~QOl%G;1?v!^t%OOclS!s)y
z`^Mg4P*RqaezbSk8`Ck1y9^O)ez~|bRhXN!77__2jxVvI%#cj^Pvq`kE8}Q-#s9<-
zYDqM)=(owq1jiC>pj55C+@{2a<v8Wq)TZsaWtZW7s^o{2xc^YzQ91523<${kTkd{H
z>DfgO+UXX=CxMBz5$zz9CC-Q|gZp4#n&wWTYE#*UD9J|40jF@95W^XmL@Ai{L4i)X
zwFacseFXAy12PFpUNM!fI@A%h#b-u%RE_eFe||Q=$wA9&rY1CX1V5l(NTybYet;7|
zK4?-NW7Q0r+CD;cv^_B8&r~LWPXAcR?uw?KQQ>)-BZe*nMGODh6Vh39H(Opq9Or0W
zp-a#P0_3@hUi8t^i(nD`7@z@SbhYOxLM6)tk|fbv#1K+QL&G3NcR)Huj6>p(*>7Z~
f87H3rE|5*aMJy24sp1^&QBNkW5Y`A^rGMlvkg$Ex

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/Estado.class b/out/production/practicaIA1/com/lluc/practicaIA1/Estado.class
index 976f788b6b539e05d59009b4874d337f07ad7a9b..6936e39afca3a5ab39e0ebf76c52815ffbad835a 100644
GIT binary patch
literal 8216
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

literal 7866
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
R{km=+*X<L!{f2Iz{6D;L)*1i+

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/Main$1.class b/out/production/practicaIA1/com/lluc/practicaIA1/Main$1.class
index b5aec987c18b13e8e29ceeb49ca94f7adf8234f7..29551869a7648044677f9d671ab0b6f297accee6 100644
GIT binary patch
literal 922
zcmaJ<!EVz)5Pj>Ubz+=04W&>*X@NlFq{1o}4k?wQ2vkdHi4>Fzr;TH!TRC=EuQ~8d
zT(}g81LDj_A!eN%q9kBxc6MfGp5Hvp?>|3&0_dP=!9dPL-o^$t8Ok^OGj~HCjotUd
zo4{8Ln`a^t>YO20cLo*;D4MWr+=0!o<F(!P7e0w2x5q!FfeIMxaiDrq#8Qm-DC_bp
zY+>6(*~Shk3{^j#xM7(3?o@JL37>oIQ}>dKsCLR=((9B<LUQWe75vtkl;fG$W!TNQ
zr%HrwCxhTBmJIn$JR-2|u84xGbTSO&2R;lbQ|ZP&4+mTd9nX__buAKxgYJJgwit{l
zF}=Hni+*~=a9r;$E7@AjI36i}8K~=c)Z>y*NIywGFZRVa;wse|yjks<WtQeVTf^m?
zh+6$Pm45I}=!uJ3<CmHk>G3x5!#EMqct*g)bB6tYPHp2DbrN$z2n>7mj|;r|N)k-V
z888&Cf<#@!3GI#TMNuF-Ay1MZ!4a*10n&`tE=NY&M$tXGx#XG7G`@p<ql<w(I`uQ~
z2>0o<X9akGeTr!9P@z*dU+DEEZ#8dWo{){cQnZM0m?0d^s^$n(kB6vcs22UB3ZvX6
z)C20&sIRG7qm~-YUnrcA-J-M%yhyDy2YyUVMFS|4C)>awT?`ujN#>v88TmYFcmXHN
O)X*Sr5tA+Q^!){I!NUyz

delta 498
zcmZ{f&q@MO6vn?h>Wod-(y~8h>7-HqgIOfFi9*~cM7e5z%RxqTrp7TM0-r(LMf3!2
z+8DHm);&s3&?-7Jx@pmcbG~yA-~HWl9+hvo{Q2|t4xoa93K=OC0i+dZDni&*kWr9T
zu*V=DnU?7uGX!$^i_uqw^M+*^POU5YePf(r+0j#Ze8Nu0&+P7yV;=_$;WMM}*6qH_
z5yk>X4ta)HqpDZ$MbEbMrnngxuE7ySZ1kWNqaAT8^scbl`uSzYxN;fderw>GUA<=a
zu7x99+hItIhKX@S$_#niaGQ>4J7!C?{NWnVXmlA23au5Opug#+Ql*nJ(oo?Q?1c&m
zi<CVxunkU`&kTrQnQqJ*jk5Q+PHqpU7N?L(6s-w{e-UXPq0MY_1U<kCR(-6BI8{=#
zO4zkIwnA<X8z~e&5GYYh5u8xtzu6*la0u(P5ZN}c>Dv?7A`K!*tL*rlB$h~3`YA+8
F=ND|^L<j%?

diff --git a/out/production/practicaIA1/com/lluc/practicaIA1/Main.class b/out/production/practicaIA1/com/lluc/practicaIA1/Main.class
index f19a0209dd18b86b7a32a34fd1bdb1d1253e93e0..375242122d9a7af056111f3eecfd57bc9e77fc87 100644
GIT binary patch
delta 1975
zcmZWpX;@TM7=F(z_s-n8$i9p$4h$#`;Gm)+5sIKT1}K6H=F$Zx869SD=3;0IWwxo6
zb+WX*tf0(HsR5ia+sm?OFU!iTe)%JR^*lX2+IL2jAI|gKIp=)q`=0On&S2hPUi$I#
zM~(uh!CwjtFv>8gFhk-O<kYcJr7z&qs~C)h6PH?HfmMd0!UmO3uuL{uFosVuJL422
zAW=q=ie#kl<(BeX8EFiO>$OdqyG!@^-A!#;Am9y&5E&}$7|VBAvK0lX$P(GI`2kC2
zk2sD~;Xp2f9PoDQo`4=p?Xkegkm3vIq2SuCHm}34Il|r!pWm-pP{5Ehs`2_AAx-xM
zMXU)b3NevE5wU86U9Em^EL^ROB69LnyQ{Zo9l?Nmk+!kRt5<r%3S1}=fF?1R3q78R
zOJ$T&=26q;kQNAc21B}6fg4kV?NkPPAwS1b5^Kr9ifNcGV}^=y%;X7D4nM>46d}Dz
zMJ2B0X2W>8<XNQ3NUhg=f&9q|s$dkU=crVMS{`q8mMY{xvT2yF;u=T{V|*Q*Azz0t
zv_{uj{hERWxK>7;ih48<0RFex&X*Xfs3wbexs)ZzSj<pN;#7XjkZx1ZC~CWe!8sz6
zlII6Cf3r8ND`*zF<qRd4bbOXEiF}p``E`uybIzKUxF{5)E9_9P0;>e^)x5^KoeZw$
z=Oq_euMyU547p^T#fOb%DsU^j!t@4y!djCe`lMYni6j*3RcwHtCn$Mjw*UbZL3Hx{
zrh=GTNJSVrpQ4n;w3}4ih;D8(O`RiS3qx|OxBOaQoqKL~o41on9#F6uH><csTvt3@
zRzPpkwYCjZvNoz#4{nojyNa#2gX>CJoDFy4E*W>LxCi(0KBcVEh8@@`<31Jl;{j@r
z(f0M|Uh1k~i2AZ!3pY?Z#Tsda@OV(gL*V?ZlH-uEn;~HoS(8p6)``@Qs@Q|QT(Qki
zl4#f-SMda%<PEkZZX2G)Gcul4@to-UF{4TAd|^ss3j4Nrh0*gWUcieyYRloNY?zlA
zT>ZNZ-HgvRwew+9qnk3%2?q7B9@0ANy?T3aZP<bzsgIc>-@)P~{G{M#oRaa2Nd7B7
zZJS_X*i*<G)eK&$_M|eX9x<dfek~mKhGqQDP{2>AIZA$AFu0+sQ^p_sq?$X9LAoeF
zF4fIId_X0pOpxfmmnX)h_4JWUoPapIME`1RZ^p~mPbVv0!2w|lu-Rm1CE3oykdxvf
zh>s$*<uK9*kXct0LC)1eo_D3ZO33rCkdL2fio!LoB`bRX#T8N%?iRb0VWQLI3fV68
zqs%V%qry&_s+IxFj-Wb<X|$VLVX<2xm}j>P!gGiK8PLbi#x3j-@E6m=MG)~S4$_)T
zjrJN25rGWoIE;R>EyYT_PCFw!G{kQp0uzl@xp)PLU@J{G4L_&@>Gd4IAjMO}=#E@M
zHrdD&xmA!_7$en4n40RMSlvvUrS(xPqqU_WiWM!cqT-SPtgIlWYe=Y7n4@TIv77AX
z0j#Z%C`JV9>{0~2L3D_9;~=_vVG;LvlYnhO3&Gt?VEcGR{H)6q6A1hej>L#nBZ@bP
zn1cwsg`;F!f?~XlV?=B^oOlQCQpIbKhWGG3!Cyu45AY%R5)FJr6oHTFv%>HXR?66H
zBE~es7a3z81vHVm%oV|mTZgcXp{{5M+Zp!4Nt<1aGCf@HDvsch24YlPas-cot~I{*
z!bwpcfjut48N=?PP}x+LPjH+NJE`YBrJYfP$7eV}t9V{N#}|}*1k-;|Wb7y;1-&{W
zn6{F$a4IlXX1a#(6r-8UbY%`<pCJZDz#stI80)=o`VxkN37G-WA`Ws*ry>r=Fc^@B
zFR2~GZ4}@ud`;`+%m(%^jgAT5kkEi{@g1!uGOfb*w6oCeBz-^NH##MeMHQ{$cN%B#
HC+z<NL~g93

delta 1957
zcmZWqX>?OX6#gdLdwF@KZD>nFXiYaLX+x=03Zay(RHA9I>_rw|ODrjAQj@fnx)cyM
z#HEg?2yUQMalukemnh<bB5r_+iVLEm{_sCXj|aRHkRA^?=gr)E=PutjGj}qOJCNIT
z<lN8!0Oj~ip`qQ3o6#X-y@F2MBH>n{-=@Hb+r`i&V}p#1Lfj<b4h1SUOSn_P2;5~x
zI_?(3JreF!U`4xF-Xh^Xg^Z-6W2=J6xL?Kt5*}1A8toFg9#Swy2;B;@#r&`W2e^bs
z6yyqhn}U2iD&RaOq{l^y?LvA&NIN9#R8WK`6+DHfEqDgcS`ff4G3=J`oG?FcC4Mhj
zuoo|h;bjT0NO+Y&^#p^yQQ<iOEfVoX7)%xZpg&s4pf4Q1gm=hC`COfYhje3kwYiv2
z(pU7gnmZYvWGdx<D9w5a`}kpF0bgLLOHwfvZV9ic=*9l-&b$>8`c%A*HyBczwRWwf
zE$R=HENs-MVpv5C{UTyO#UO?l()___IJBm%(dP(gj)<?t9|&j+)?u?R;0S9`e@I0f
zZ}MK2E{piLD3ou|rCEh?K*hE2s;EINgPr%vHYLAQ#oIV2)H=O=tcrKwR#Arq3^rv}
zr`8e*I_6QWIRSr5gFo2haJXERyjx$QXUOABvGY@AnPeBqE<VBFFp5I&@-qe}S#x-|
zlG7zD?+L1u`F$Kx(So3g5AdOiMyz2NnV=ugf=wlJI~skhM1s~2i{1K2#Swfg;S&{~
z;xiSW<EV;bIL?qV9JDYRCS)qUz?Wp79STJw(XiH9<BP5ht%)StP54U22^C-C8wua4
zIEf(@-{E_rDE6T6f63-IH2WH(w6nu!;)(ibXG7uc>eBALQ?eLz{vboTH{szAm3V@!
zZBYW@(^{r+C$pC@NI_pm)DxsUbWuDEiqNY<Z4Cim!c@gzEcAHBFCh$tyiS*9s3L_Q
z(&eQxjPSR#hW#!6@am}65YYHC!xkgM%t9|OHDvK7V-DYG%;jf|6Rix%<Qb&mTI0G!
zVXe`}_n6A~@20X8!mw70)Kb|*!R36Zl+CwE<w**Dz>id(Ir1HhpO6-3QpI7iUVnrl
z3=w~)k1v<AWeKOm&i%}fTgIspex)AphC=JwTKQj=9VQ897z+3~O94No=42p;`mLN=
z3Do_Jj@?b;G@hE2(N#e<6KOyarqie<WFsmugETW{VwUg)*i7;>lWpsM=&bq}3~?Ci
z_ruf=$y*eIJYCq$m)k3aUAfF|nMw)N>iRKR{YY|~;uukHGi4e`OLj{(Qy)@nQXf)n
zv|_FA$H*Ac;z%bc!!6t77)IIT0c7?PARQ|BpGot(1pEb%1w_oo9GXXBJ*qI52xKCP
zYFtge6R`sGNYcYYJ|0{H0~TS5=s+Ua0H<g}NZ1Gq=Hoibr-;70xCvS0BT?oCLCTgO
zHJUKly>YA>Lqb+f9N9EqQ5%P&-dR-a>PL>7nC6l(&uxq&zusoB8T(P-Hc^fk#@b9V
zj2l3qn8y#m*#lYZXK^o;lu=J`iwJB5&rF_iiDC)?Ur4Y8u~}G*B}B|Y=eiWj$k&Bp
zid#;^CL<5mQwAeZ&A>{mBKRxGz8W`BEYW~Q6vZsgT6Y%o`V|?7F+Bhm7-KgjG|+OH
zGlp{4ASN()iv~f>v>kaQOk_BS(i&%R3|H0?qhi+(CV}2bL(ln>;&=r1q?Eh_b|<CE
zqGR#lMnarNcdm&fy-1I>@YAf&0W@PB6~Bn-A1D$6g|tA=(?v|1C|Cp)=qv2bL6kA<
zg57B!#8tWk7y*L-Y-X(I{OSKN>`So+#T9W-=qNhGPy&OF{;FE(I*8pUz)c9#e5taI
q{Y|Z7K!l7sx<PF;8_3m4_XRZS=)3Uy3BTYpY}iApOddV-z3?vzy`L=r

diff --git a/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
index f1566ff..76413a3 100644
--- a/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
+++ b/src/com/lluc/practicaIA1/AzamonSuccessorFunction.java
@@ -18,21 +18,25 @@ public List getSuccessors(Object a) {
                 Estado newState = new Estado(estado_actual);
 
                 if(newState.swap(i, j)){
-                    String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toStringSimple());
+                    //String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toStringSimple());
+                    String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toString());
                     retVal.add(new Successor(S, newState));
                 }
             }
         }
+
         for (int i = 0; i < paquetes.size(); ++i) {
             for (int j = 0; j < transporte.size(); ++j) {
                 Estado newState = new Estado(estado_actual);
                 if(newState.moure_paquete(i, j)) {
-                    String S = "MOVIDO paquete: " + i + " a la oferta " + j + newState.toStringSimple();
+                    //String S = "MOVIDO paquete: " + i + " a la oferta " + j + newState.toStringSimple();
+                    String S = "MOVIDO paquete: " + i + " a la oferta " + j + newState.toString();
                     retVal.add(new Successor(S, newState));
                 }
             }
         }
 
+
         return retVal;
     }
 }
diff --git a/src/com/lluc/practicaIA1/Estado.java b/src/com/lluc/practicaIA1/Estado.java
index 25e6ff3..d6825f9 100644
--- a/src/com/lluc/practicaIA1/Estado.java
+++ b/src/com/lluc/practicaIA1/Estado.java
@@ -279,17 +279,23 @@ public void imprimir_tabla() {
         for (int i = 0; i < vecOfertas.length; ++i) {
             double peso_acumulado = 0.00;
             System.out.println("---------------------------------------------------------------------------------------------------------");
-            System.out.print("| Oferta: " + i + " Peso maximo de la oferta: " + transporte.get(i).getPesomax() + ", Peso_acumulado(" + peso_acumulado + "kg) |");
+            System.out.print("| Oferta: " + i + /*+ " Peso maximo de la oferta: " + transporte.get(i).getPesomax()  + ", Peso_acumulado(" + peso_acumulado + "kg)*/" |");
+			System.out.println("dias: " + transporte.get(i).getDias());
+			System.out.println("precio: " + transporte.get(i).getPrecio());
+			System.out.println("peso maximo: " + transporte.get(i).getPesomax());
             //System.out.println(transporte.get(i).toString());
             for (int j = 0; j < vecPaquetes.length; ++j) {
                 if (vecPaquetes[j] == i) {
                     peso_acumulado += paquetes.get(j).getPeso();
-                    System.out.print(" Paquete: " + j + "Peso(" + paquetes.get(j).getPeso() + "kg), Peso_acumulado(" + peso_acumulado + "kg) |");
+                    System.out.print(" Paquete: " + j + ", Peso(" + paquetes.get(j).getPeso() + " kg) ");
                     //System.out.println(paquetes.get(j).toString());
                 }
             }
-            System.out.print("Peso libre " + vecOfertas[i] + "kg |");
+			System.out.println();
+			System.out.println(" Peso_acumulado(" + peso_acumulado + "kg) |");
+            System.out.println("Peso libre " + vecOfertas[i] + "kg |");
 		}
+		System.out.println("Coste total: " + coste);
     }
 
 	//IMPRIMIR ORIGINAL
@@ -315,16 +321,20 @@ public String toString() {
 		for (int i = 0; i < vecOfertas.length; ++i) {
 			double peso_acumulado = 0.00;
 			s += "--------------------------------------------------------------------------------------------------------- \n";
-			s += "| Oferta: " + i + " Peso maximo de la oferta: " + transporte.get(i).getPesomax() + ", Peso_acumulado(" + peso_acumulado + "kg) |";
+			s += "| Oferta: " + i /*+ " Peso maximo de la oferta: " + transporte.get(i).getPesomax() */;
+			s += ("\n dias: " + transporte.get(i).getDias());
+			s += ("\n precio: " + transporte.get(i).getPrecio());
+			s += ("\n peso maximo: " + transporte.get(i).getPesomax());
 			//System.out.println(transporte.get(i).toString());
 			for (int j = 0; j < vecPaquetes.length; ++j) {
 				if (vecPaquetes[j] == i) {
 					peso_acumulado += paquetes.get(j).getPeso();
-					s += " Paquete: " + j + "Peso(" + paquetes.get(j).getPeso() + "kg), Peso_acumulado(" + peso_acumulado + "kg) |";
+					s += " Paquete: " + j + ", Peso(" + paquetes.get(j).getPeso() + "), prioridad: " + paquetes.get(j).getPrioridad();
 					//System.out.println(paquetes.get(j).toString());
 				}
 			}
-			s += " Peso libre " + vecOfertas[i] + "kg |";
+			s += "\n Peso_acumulado(" + peso_acumulado + " kg) |";
+			s += "\n Peso libre: " + vecOfertas[i] + "kg |";
 			peso_libre += vecOfertas[i];
 		}
 		s += "peso_libre_total: " + peso_libre + "\n";