[Nice-commit] Nice/src/mlsub/typing/lowlevel DomainVector.java,1.6,1.7 K0.java,1.28,1.29
Brought to you by:
bonniot
|
From: Arjan B. <ar...@us...> - 2005-03-31 09:26:48
|
Update of /cvsroot/nice/Nice/src/mlsub/typing/lowlevel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7374/F:/nice/src/mlsub/typing/lowlevel Modified Files: DomainVector.java K0.java Log Message: Replaced Vector with ArrayList. Index: K0.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/K0.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** K0.java 30 Mar 2005 23:08:16 -0000 1.28 --- K0.java 31 Mar 2005 09:26:39 -0000 1.29 *************** *** 1,5 **** package mlsub.typing.lowlevel; ! import java.util.Vector; /** --- 1,5 ---- package mlsub.typing.lowlevel; ! import java.util.ArrayList; /** *************** *** 77,81 **** this.posTagged = new BitVector(); this.negTagged = new BitVector(); ! this.interfaces = new Vector(); if (debugK0) { System.err.println("created K0 #" + ID); --- 77,81 ---- this.posTagged = new BitVector(); this.negTagged = new BitVector(); ! this.interfaces = new ArrayList(); if (debugK0) { System.err.println("created K0 #" + ID); *************** *** 388,392 **** Ct.setSize(n); if (domains != null) { ! domains.setSize(n - m); } garbage.truncate(n); --- 388,392 ---- Ct.setSize(n); if (domains != null) { ! domains.truncate(n - m); } garbage.truncate(n); *************** *** 469,473 **** // a vector of all the Interfaces in this constraint ! private Vector interfaces; /** * Returns the number of interfaces. Interfaces are garanteed to be --- 469,473 ---- // a vector of all the Interfaces in this constraint ! private ArrayList interfaces; /** * Returns the number of interfaces. Interfaces are garanteed to be *************** *** 480,484 **** // assume 0 <= iid < nInterfaces() Interface getInterface(int iid) { ! return (Interface)interfaces.elementAt(iid); } --- 480,484 ---- // assume 0 <= iid < nInterfaces() Interface getInterface(int iid) { ! return (Interface)interfaces.get(iid); } *************** *** 497,501 **** int iid = nInterfaces(); Interface iface = new Interface(this, iid); ! interfaces.addElement(iface); if (debugK0) { System.err.println("newInterface in #" + ID + " -> " + iid); --- 497,501 ---- int iid = nInterfaces(); Interface iface = new Interface(this, iid); ! interfaces.add(iface); if (debugK0) { System.err.println("newInterface in #" + ID + " -> " + iid); Index: DomainVector.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/DomainVector.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DomainVector.java 30 Mar 2005 23:08:16 -0000 1.6 --- DomainVector.java 31 Mar 2005 09:26:39 -0000 1.7 *************** *** 11,15 **** * @author Alexandre Frey **/ ! final class DomainVector extends java.util.Vector { int offset; // offset int width; // size of domains --- 11,15 ---- * @author Alexandre Frey **/ ! final class DomainVector extends java.util.ArrayList { int offset; // offset int width; // size of domains *************** *** 21,28 **** public DomainVector(int offset, int width, int n) { super(n); - setSize(n); //if (width > 0) { for (int i = 0; i < n; i++) { ! setElementAt(new Domain(width), i); } //} --- 21,27 ---- public DomainVector(int offset, int width, int n) { super(n); //if (width > 0) { for (int i = 0; i < n; i++) { ! add(new Domain(width)); } //} *************** *** 31,35 **** } public Domain getDomain(int x) { ! return (Domain)elementAt(x - offset); } --- 30,39 ---- } public Domain getDomain(int x) { ! return (Domain)get(x - offset); ! } ! ! void truncate(int x) ! { ! removeRange(x, size()); } *************** *** 42,46 **** public void clear(int x) { ! setElementAt(null, x - offset); } public void reduce(int x, boolean unit, BitVector domain) --- 46,50 ---- public void clear(int x) { ! set(x - offset, null); } public void reduce(int x, boolean unit, BitVector domain) *************** *** 72,77 **** public void exclude(int value) throws LowlevelUnsatisfiable { ! for (int i = 0; i < elementCount; i++) { ! Domain d = (Domain)elementData[i]; if (d != null) { d.exclude(value); --- 76,81 ---- public void exclude(int value) throws LowlevelUnsatisfiable { ! for (int i = 0; i < size(); i++) { ! Domain d = (Domain)get(i); if (d != null) { d.exclude(value); *************** *** 82,91 **** S.assume(S.a&& isValidSoft(src)); S.assume(S.a&& isGarbage(dest)); ! setElementAt(getDomain(src), dest - offset); clear(src); } public void extend() { // if (width > 0) { ! addElement(new Domain(width)); //} else { //addElement(null); --- 86,95 ---- S.assume(S.a&& isValidSoft(src)); S.assume(S.a&& isGarbage(dest)); ! set(dest - offset, getDomain(src)); clear(src); } public void extend() { // if (width > 0) { ! add(new Domain(width)); //} else { //addElement(null); *************** *** 95,102 **** public Object clone() { DomainVector result = (DomainVector)super.clone(); ! for (int i = 0; i < elementCount; i++) { ! Domain d = ((Domain)elementData[i]); if (d != null) { ! result.elementData[i] = new Domain(d); } } --- 99,106 ---- public Object clone() { DomainVector result = (DomainVector)super.clone(); ! for (int i = 0; i < size(); i++) { ! Domain d = ((Domain)get(i)); if (d != null) { ! result.set(i, new Domain(d)); } } *************** *** 132,136 **** // and intersect the domain of all element j above x with ideal ! for (int j = offset; j < offset + elementCount; j++) { Domain dj = getDomain(j); if (dj != null && C.get(x, j)) { --- 136,140 ---- // and intersect the domain of all element j above x with ideal ! for (int j = offset; j < offset + size(); j++) { Domain dj = getDomain(j); if (dj != null && C.get(x, j)) { *************** *** 172,177 **** void initGfpCardinals() { ! for (int i = 0; i < elementCount; i++) { ! Domain d = (Domain)elementData[i]; if (d != null) { d.initGfpCardinals(); --- 176,181 ---- void initGfpCardinals() { ! for (int i = 0; i < size(); i++) { ! Domain d = (Domain)get(i); if (d != null) { d.initGfpCardinals(); *************** *** 197,203 **** int leastCard = Integer.MAX_VALUE; int least = Integer.MIN_VALUE; ! for (int i = 0; i < elementCount; i++) { if (set == null || set.get(i + offset)) { ! Domain d = (Domain)elementAt(i); if (d != null){ int card = d.cardinal(); --- 201,207 ---- int leastCard = Integer.MAX_VALUE; int least = Integer.MIN_VALUE; ! for (int i = 0; i < size(); i++) { if (set == null || set.get(i + offset)) { ! Domain d = (Domain)get(i); if (d != null){ int card = d.cardinal(); *************** *** 217,227 **** Separator sep = new Separator(", "); StringBuffer sb = new StringBuffer(); ! for (int i = 0; i < elementCount; i++) { ! if (elementData[i] != null) { sb.append(sep) .append("D(") .append(i + offset) .append(") = ") ! .append(elementData[i]); } } --- 221,231 ---- Separator sep = new Separator(", "); StringBuffer sb = new StringBuffer(); ! for (int i = 0; i < size(); i++) { ! if (get(i) != null) { sb.append(sep) .append("D(") .append(i + offset) .append(") = ") ! .append(get(i)); } } |