Changeset 2651

Timestamp:

11/10/08 10:48:37 (2 months ago)

Author:

leo

Message:

[ADD] bit vector
[TODO] lattice implementation

Location:

XerialJ/trunk/xerial-core/src

Files:

• main/java/org/xerial/util/BitVector.java (added)
• main/java/org/xerial/util/IndexedSet.java (added)
• main/java/org/xerial/util/graph/AdjacencyList.java (modified) (8 diffs)
• main/java/org/xerial/util/graph/Automaton.java (added)
• main/java/org/xerial/util/graph/AutomatonAction.java (added)
• main/java/org/xerial/util/graph/Lattice.java (added)
• test/java/org/xerial/util/BitVectorTest.java (added)
• test/java/org/xerial/util/IndexedSetTest.java (added)

XerialJ/trunk/xerial-core/src/main/java/org/xerial/util/graph/AdjacencyList.java

@@ -29 +29 @@
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
@@ -110 +111 @@
     public Collection<NodeLabel> getNodeLabelSet()
     {
-        return _nodeTable.values();
+        return _nodeTable.getNodeLabelSet();
     }
 
     public Collection<Integer> getNodeIDSet()
     {
-        return _nodeTable.keySet();
+        return _nodeTable.getNodeIDSet();
     }
 
@@ -260 +261 @@
     public String toString()
     {
-        String nodeData = CollectionUtil.displayMap(_nodeTable, ":", ", ");
+        String nodeData = CollectionUtil.displayMap(_nodeTable.getNodeTable(), ":", ", ");
 
         ArrayList<String> edgeData = new ArrayList<String>();
@@ -270 +271 @@
         return "node: " + nodeData + "\n" + StringUtil.join(edgeData, "\n");
     }
+    
 
 }
 
-class NodeTable<NodeType> extends TreeMap<Integer, NodeType>
+class NodeTable<NodeType> 
 {
     private static final long serialVersionUID = 1L;
@@ -279 +281 @@
     private int _numNode = 0;
 
+    private TreeMap<Integer, NodeType> _nodeTable       = new TreeMap<Integer, NodeType>();
     private HashMap<NodeType, Integer> _nodeIDIndex = new HashMap<NodeType, Integer>();
+
+    public NodeType get(int nodeID)
+    {
+        return _nodeTable.get(nodeID);
+    }
+    
+    public Set<NodeType> getNodeLabelSet()
+    {
+        return _nodeIDIndex.keySet();
+    }
+
+    public Set<Integer> getNodeIDSet()
+    {
+        return _nodeTable.keySet();
+    }
+    
+    public boolean containsValue(NodeType value)
+    {
+        return _nodeIDIndex.containsKey(value);
+    }
+    
+    public boolean containsKey(Integer nodeID)
+    {
+        return _nodeTable.containsKey(nodeID);
+    }
+    
+    public Map<Integer, NodeType> getNodeTable()
+    {
+        return _nodeTable;
+    }
+    
+    public int size()
+    {
+        return _nodeTable.size();
+    }
 
     public int getNodeID(NodeType node)
@@ -289 +327 @@
     public int add(int nodeID, NodeType node)
     {
-        super.put(nodeID, node);
+        _nodeTable.put(nodeID, node);
         if (nodeID > _numNode)
             _numNode = nodeID;
@@ -300 +338 @@
     {
         int newNodeID = _numNode + 1;
-        super.put(newNodeID, node);
+        _nodeTable.put(newNodeID, node);
         _nodeIDIndex.put(node, newNodeID);
         ++_numNode;
@@ -309 +347 @@
     {
         _numNode = 0;
-        super.clear();
+        _nodeTable.clear();
         _nodeIDIndex.clear();
     }