From: Sébastien Miquée Date: Tue, 9 Feb 2010 15:00:27 +0000 (+0100) Subject: Correction of a bug. X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/mapping.git/commitdiff_plain/f1c6b5b3689609125caaa1e7a76a356ef2210ea1 Correction of a bug. - In Mapping class, an error was encountered in the add of an Association in the mapping. --- diff --git a/Makefile b/Makefile index bcb41b0..292a7c7 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ clean: @echo @echo "## Cleaning project ..." @echo - rm -rf ./$(BIN)/* ./$(JAR) ./$(JAVADOC)/* + rm -rf ./$(BIN)/* ./$(JAR) cleanDoc: diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html index 7ffe7ad..3196674 100644 --- a/javadoc/allclasses-frame.html +++ b/javadoc/allclasses-frame.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html index 802c5cd..b3410f4 100644 --- a/javadoc/allclasses-noframe.html +++ b/javadoc/allclasses-noframe.html @@ -2,12 +2,12 @@ - + All Classes - + diff --git a/javadoc/and/Mapping/Algo.html b/javadoc/and/Mapping/Algo.html index 54faa7a..b1f83d3 100644 --- a/javadoc/and/Mapping/Algo.html +++ b/javadoc/and/Mapping/Algo.html @@ -2,12 +2,12 @@ - + Algo - + diff --git a/javadoc/and/Mapping/Architecture.html b/javadoc/and/Mapping/Architecture.html index da17f05..d656fdd 100644 --- a/javadoc/and/Mapping/Architecture.html +++ b/javadoc/and/Mapping/Architecture.html @@ -2,12 +2,12 @@ - + Architecture - + diff --git a/javadoc/and/Mapping/Association.html b/javadoc/and/Mapping/Association.html index f35c71f..d78a52c 100644 --- a/javadoc/and/Mapping/Association.html +++ b/javadoc/and/Mapping/Association.html @@ -2,12 +2,12 @@ - + Association - + @@ -183,6 +183,22 @@ Class representing an association between a tasks list and a cluster
          Return the associated task. + + + void +setGNode(GNode _g) + +
+          Replace the GNode of the association. + + + + void +setGtask(GTask _t) + +
+          Replace the GTask of the association. +   @@ -317,6 +333,38 @@ public GTask
Returns:
The associated task
+
+ +

+setGNode

+
+public void setGNode(GNode _g)
+
+
Replace the GNode of the association. +

+

+
+
+
+
Parameters:
_g - The replacing GNode
+
+
+
+ +

+setGtask

+
+public void setGtask(GTask _t)
+
+
Replace the GTask of the association. +

+

+
+
+
+
Parameters:
_t - The replacing GTask
+
+
diff --git a/javadoc/and/Mapping/Cluster.html b/javadoc/and/Mapping/Cluster.html index a7ae852..a8187de 100644 --- a/javadoc/and/Mapping/Cluster.html +++ b/javadoc/and/Mapping/Cluster.html @@ -2,12 +2,12 @@ - + Cluster - + diff --git a/javadoc/and/Mapping/DefaultMapping.html b/javadoc/and/Mapping/DefaultMapping.html index c04c87a..4b7b34f 100644 --- a/javadoc/and/Mapping/DefaultMapping.html +++ b/javadoc/and/Mapping/DefaultMapping.html @@ -2,12 +2,12 @@ - + DefaultMapping - + diff --git a/javadoc/and/Mapping/GNode.html b/javadoc/and/Mapping/GNode.html index 3981fdb..eff94c8 100644 --- a/javadoc/and/Mapping/GNode.html +++ b/javadoc/and/Mapping/GNode.html @@ -2,12 +2,12 @@ - + GNode - + diff --git a/javadoc/and/Mapping/GTask.html b/javadoc/and/Mapping/GTask.html index 4638d2f..ee1b9bd 100644 --- a/javadoc/and/Mapping/GTask.html +++ b/javadoc/and/Mapping/GTask.html @@ -2,12 +2,12 @@ - + GTask - + diff --git a/javadoc/and/Mapping/Graph.html b/javadoc/and/Mapping/Graph.html index 339f15b..389f86f 100644 --- a/javadoc/and/Mapping/Graph.html +++ b/javadoc/and/Mapping/Graph.html @@ -2,12 +2,12 @@ - + Graph - + diff --git a/javadoc/and/Mapping/Grid.html b/javadoc/and/Mapping/Grid.html index d70d4b3..c12e2c3 100644 --- a/javadoc/and/Mapping/Grid.html +++ b/javadoc/and/Mapping/Grid.html @@ -2,12 +2,12 @@ - + Grid - + diff --git a/javadoc/and/Mapping/LSM.html b/javadoc/and/Mapping/LSM.html index 08d2338..55cd0fd 100644 --- a/javadoc/and/Mapping/LSM.html +++ b/javadoc/and/Mapping/LSM.html @@ -2,12 +2,12 @@ - + LSM - + diff --git a/javadoc/and/Mapping/Linpack.html b/javadoc/and/Mapping/Linpack.html index 4a65f0f..0c9a043 100644 --- a/javadoc/and/Mapping/Linpack.html +++ b/javadoc/and/Mapping/Linpack.html @@ -2,12 +2,12 @@ - + Linpack - + diff --git a/javadoc/and/Mapping/Mapping.html b/javadoc/and/Mapping/Mapping.html index 11ade80..5908d40 100644 --- a/javadoc/and/Mapping/Mapping.html +++ b/javadoc/and/Mapping/Mapping.html @@ -2,12 +2,12 @@ - + Mapping - + @@ -163,6 +163,15 @@ Class representing the tasks mapping on clusters and/or nodes + + + +
+ intgetIdOfAssociation(GNode _g) + +
+          Return the position of the association containing + the GNode _g.
 java.util.ArrayList<GNode> getMappedGNodes() @@ -385,6 +394,24 @@ public java.util.ArrayList<
+

+getIdOfAssociation

+
+public int getIdOfAssociation(GNode _g)
+
+
Return the position of the association containing + the GNode _g. +

+

+
+
+
+
Parameters:
_g - The GNode to be search +
Returns:
The position of the association
+
+
+
+

calcDepExt

diff --git a/javadoc/and/Mapping/QM.html b/javadoc/and/Mapping/QM.html
index ebba3fb..bfd4fee 100644
--- a/javadoc/and/Mapping/QM.html
+++ b/javadoc/and/Mapping/QM.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 QM
 
 
-
+
 
 
 
diff --git a/javadoc/and/Mapping/Simple.html b/javadoc/and/Mapping/Simple.html
index a1bacdf..481416e 100644
--- a/javadoc/and/Mapping/Simple.html
+++ b/javadoc/and/Mapping/Simple.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Simple
 
 
-
+
 
 
 
diff --git a/javadoc/and/Mapping/Utils.html b/javadoc/and/Mapping/Utils.html
index e7020b1..7348328 100644
--- a/javadoc/and/Mapping/Utils.html
+++ b/javadoc/and/Mapping/Utils.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Utils
 
 
-
+
 
 
 
diff --git a/javadoc/and/Mapping/package-frame.html b/javadoc/and/Mapping/package-frame.html
index 938536a..63103f9 100644
--- a/javadoc/and/Mapping/package-frame.html
+++ b/javadoc/and/Mapping/package-frame.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 and.Mapping
 
 
-
+
 
 
 
diff --git a/javadoc/and/Mapping/package-summary.html b/javadoc/and/Mapping/package-summary.html
index 7f69f11..62837c2 100644
--- a/javadoc/and/Mapping/package-summary.html
+++ b/javadoc/and/Mapping/package-summary.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 and.Mapping
 
 
-
+
 
 
 
diff --git a/javadoc/and/Mapping/package-tree.html b/javadoc/and/Mapping/package-tree.html
index b600c39..c69ac2f 100644
--- a/javadoc/and/Mapping/package-tree.html
+++ b/javadoc/and/Mapping/package-tree.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 and.Mapping Class Hierarchy
 
 
-
+
 
 
 
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index 3ca6f6e..8409727 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Constant Field Values
 
 
-
+
 
 
 
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index f1ab2de..da2d119 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Deprecated List
 
 
-
+
 
 
 
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index 99d4c6e..394b6e8 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 API Help
 
 
-
+
 
 
 
diff --git a/javadoc/index-all.html b/javadoc/index-all.html
index 0aa775d..e20239e 100644
--- a/javadoc/index-all.html
+++ b/javadoc/index-all.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Index
 
 
-
+
 
 
 
@@ -213,6 +213,10 @@ Method in class and.Mapping.getId() - 
 Method in class and.Mapping.GNode
 
Return the uniq identifier of the computing node.
+
getIdOfAssociation(GNode) - 
+Method in class and.Mapping.Mapping
+
Return the position of the association containing 
+ the GNode _g.
 
getInCluster() - 
 Method in class and.Mapping.GNode
 
Return the status of the computing node concerning its
@@ -469,6 +473,12 @@ Method in class and.Mapping.setFrequency(int) - 
 Method in class and.Mapping.GNode
 
Set the frequency of computing cores of the computing node.
+
setGNode(GNode) - 
+Method in class and.Mapping.Association
+
Replace the GNode of the association.
+
setGtask(GTask) - 
+Method in class and.Mapping.Association
+
Replace the GTask of the association.
 
setId(long) - 
 Method in class and.Mapping.GNode
 
Set the uniq identifier of the computing node.
diff --git a/javadoc/index.html b/javadoc/index.html
index fe33d61..93597de 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 Generated Documentation (Untitled)
 
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index c6f9bf8..590fb5d 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Class Hierarchy
 
 
-
+
 
 
 
diff --git a/javadoc/serialized-form.html b/javadoc/serialized-form.html
index c68feae..aeb6824 100644
--- a/javadoc/serialized-form.html
+++ b/javadoc/serialized-form.html
@@ -2,12 +2,12 @@
 
 
 
-
+
 
 Serialized Form
 
 
-
+
 
 
 
diff --git a/src/and/Mapping/Mapping.java b/src/and/Mapping/Mapping.java
index 0499f1a..69593db 100644
--- a/src/and/Mapping/Mapping.java
+++ b/src/and/Mapping/Mapping.java
@@ -92,9 +92,10 @@ public class Mapping implements Serializable
 	{
 		if( _a != null && _a.getGNode() != null && _a.getGTask() != null )
 		{
-			int ind = _a.getGTask().getNum() ;
-			
-			mapping.add( ind - 1, _a ) ;
+//			int ind = _a.getGTask().getNum() ;
+//			
+//			mapping.add( ind - 1, _a ) ;
+			mapping.add( _a ) ;
 		}
 	}