Adri Merge

fichero_tonto.txt

@@ -1 +1 @@
-Hola
+Adeu

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>

src/com/lluc/practicaIA1/AzamonGoalTest.java

@@ -0,0 +1,11 @@
+package com.lluc.practicaIA1;
+
+import aima.search.framework.GoalTest;
+
+public class AzamonGoalTest implements GoalTest {
+
+    public boolean isGoalState(Object state){
+
+        return false;
+    }
+}

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();
+    }
+}

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();
+    }
+}

src/com/lluc/practicaIA1/AzamonSuccessorFunction.java

@@ -0,0 +1,42 @@
+package com.lluc.practicaIA1;
+import IA.Azamon.Paquetes;
+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(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(estado_actual);
+
+                if(newState.swap(i, j)){
+                    //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.toString();
+                    retVal.add(new Successor(S, newState));
+                }
+            }
+        }
+
+
+        return retVal;
+    }
+}

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();
+
+        if(newState.swap(i, j)) {
+
+            //double   v = TSPHF.getHeuristicValue(newBoard);
+            String S = ("INTERCAMBIO " + " " + i + " " + j + " " + newState.toString());
+
+            retVal.add(new Successor(S, newState));
+        }
+
+        return retVal;
+    }
+}