|
From: <de...@us...> - 2003-08-18 11:07:03
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun
In directory sc8-pr-cvs1:/tmp/cvs-serv3430/commun
Modified Files:
DodicoLib.java
Log Message:
Maj des projets hydraulique 2d
Index: DodicoLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DodicoLib.java 4 Jul 2003 08:11:42 -0000 1.9
--- DodicoLib.java 18 Aug 2003 11:05:19 -0000 1.10
***************
*** 34,37 ****
--- 34,38 ----
import java.util.Collection;
import java.util.HashMap;
+ import java.util.HashSet;
import java.util.Locale;
import java.util.StringTokenizer;
***************
*** 589,596 ****
}
}
!
public static void invert(int[] _t) {
int n= _t.length - 1;
! int n2=n/2;
int temp;
for (int i= n; i > n2; i--) {
--- 590,597 ----
}
}
!
public static void invert(int[] _t) {
int n= _t.length - 1;
! int n2= n / 2;
int temp;
for (int i= n; i > n2; i--) {
***************
*** 599,608 ****
_t[n - i]= temp;
}
! }
! public static void invert(int[] _t,int _firstIndex) {
int n= _t.length - 1;
! int nOffset=n+_firstIndex;
! int n2=(nOffset)/2;
int temp;
for (int i= n; i > n2; i--) {
--- 600,612 ----
_t[n - i]= temp;
}
! }
! /**
! * Permute les donnees du tableau a partir de l'index donne.
! */
! public static void invert(int[] _t, int _firstIndex) {
int n= _t.length - 1;
! int nOffset= n + _firstIndex;
! int n2= (nOffset) / 2;
int temp;
for (int i= n; i > n2; i--) {
***************
*** 613,626 ****
}
! public static void main(String[] args) {
! int[] d=new int[]{1,2,3,4,5,6,7
! };
! invert(d);
! DodicoLib.printObject(d, true);
! d=new int[]{1,2,3,4,5,6
! };
! invert(d,7);
! DodicoLib.printObject(d, true);
}
}
--- 617,655 ----
}
! /**
! * Rassemble dans le meme tableau les chaine du tableau <code>_init1</code>
! * et de la collection. Le tableau est ensuite range.
! */
! public static String[] mergeAndSort(String[] _init1, Collection _init2) {
! HashSet r= null;
! String[] rf= null;
! if ((_init2 != null) && (_init2.size() > 0))
! r= new HashSet(_init2);
! else if (_init1 != null) {
! r= new HashSet(_init1.length);
! } else
! return null;
! if (_init1 != null) {
! int n= _init1.length - 1;
! for (int i= n; i >= 0; i--) {
! r.add(_init1[i]);
! }
}
+ rf= new String[r.size()];
+ r.toArray(rf);
+ Arrays.sort(rf);
+ return rf;
+ }
+
+ public static void main(String[] args) {
+ String[] i= new String[] { "v1", "v4" };
+ ArrayList l= new ArrayList(5);
+ l.add("v1");
+ l.add("v5");
+ l.add("v3");
+ l.add("v2");
+ DodicoLib.printObject(mergeAndSort(i, l), true);
}
+
+ }
|