Minor corrections.

Modifying JaceP2P for experiences.

diff --git a/Makefile b/Makefile
index 12ccc45..54f3595 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,15 @@
 SRC=src
 PACKAGE=jaceP2P
 BIN=bin
+LIB=${HOME}/lib
 JAR=JaceP2P.jar
-MAPPING=/home/miquee/lib/Mapping.jar
+MAPPING=$(LIB)/Mapping.jar
 CLASSPATH=.:$(MAPPING)
 
-all: compile jar
+all: compile jar copy
 
 compile:clean
-       javac -d ./$(BIN) ./$(SRC)/$(PACKAGE)/*.java
+       javac -classpath $(MAPPING) -d ./$(BIN) ./$(SRC)/$(PACKAGE)/*.java
        rmic -classpath $(CLASSPATH):$(BIN) -d ./$(BIN) jaceP2P.JaceServer
        rmic -classpath $(CLASSPATH):$(BIN) -d ./$(BIN) jaceP2P.JaceSuperNodeServer
 
@@ -24,6 +25,9 @@ rmi:compile
 jar:   
        jar cvfm ./$(JAR) Manifest -C ./$(BIN) $(PACKAGE)
 
+copy:
+       cp $(JAR) $(LIB)
+
 clean:
        rm -rf ./$(BIN)/* $(JAR)
 

diff --git a/src/jaceP2P/JaceSpawner.java b/src/jaceP2P/JaceSpawner.java
index 7c64bed..3cb20ea 100644 (file)
--- a/src/jaceP2P/JaceSpawner.java
+++ b/src/jaceP2P/JaceSpawner.java
@@ -1068,6 +1068,13 @@ public class JaceSpawner {
                        nbExtraSpawners = (nbTasks - 1) / nbOfDaemonsPerSpawner;
 
                }
+               
+               /* Test */
+               if( algo == 3 )
+               {
+                       paramAlgo = nbFault ;
+               }
+               
                while (!recieved) {
                        try {
                                registerSpawner = centralServer.getRegisterSpawner(idAlgo, 
@@ -1090,11 +1097,11 @@ public class JaceSpawner {
                        System.out.println( "### DH = " + dh ) ;
                        
                        Utils.writeGraph( al.getGraph(), "/home/lyon/smiquee/resultats/", 
-                                       "graph_"+algo+"_"+test+".xml" ) ;
+                                       "graph_"+algo+"_"+nbFault+"_"+test+".xml" ) ;
                        Utils.writeGrid( al.getGrid(), "/home/lyon/smiquee/resultats/", 
-                                       "grid_"+algo+"_"+test+".xml") ;
+                                       "grid_"+algo+"_"+nbFault+"_"+test+".xml") ;
                        Utils.writeMapping( al.getMapping(), "/home/lyon/smiquee/resultats/",
-                                       "mapping_"+algo+"_"+test+".xml" ) ;
+                                       "mapping_"+algo+"_"+nbFault+"_"+test+".xml" ) ;
                } catch (RemoteException e1) {
                        System.err.println( "Problème avec Algo dans Spawner !" ) ;
                        e1.printStackTrace();

diff --git a/src/jaceP2P/JaceSuperNodeServer.java b/src/jaceP2P/JaceSuperNodeServer.java
index 463887a..8bee6cf 100644 (file)
--- a/src/jaceP2P/JaceSuperNodeServer.java
+++ b/src/jaceP2P/JaceSuperNodeServer.java
@@ -266,7 +266,7 @@ public class JaceSuperNodeServer extends UnicastRemoteObject implements
                
                
                /** Informing about the grid heterogeneity **/
-               System.out.println( "\nHeterogeneity of the grid : " + grid.getHeterogenityDegre() + "\n" ) ;
+               System.out.println( "\nHeterogeneity degree of the grid: " + grid.getHeterogenityDegre() + "\n" ) ;
                
 
                /** Creation of tasks GTask **/
@@ -314,6 +314,7 @@ public class JaceSuperNodeServer extends UnicastRemoteObject implements
                        break;
                case 3:
                        al = new Maheve( graph, grid ) ;
+                       ((Maheve) al).setNbSave((int)paramAlgo);
                        break ;
                default:
                        al = new DefaultMapping( graph, grid, gnodes ) ;