Changeset 5950

Timestamp:

2003-11-24T14:29:15+13:00 (20 years ago)

Author:

cs025

Message:

Improvement to classifier interface

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier

Files:

• ClassifierInterface.java (modified) (1 diff)
• ClassifierManager.java (modified) (2 diffs)
• HierarchyClassifier.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/ClassifierInterface.java

@@ -17 +17 @@
      *  the "gsdl3" namespace...
      */
-    public void classifyDocument(DocumentID documentID, DocumentInterface document);
+    public boolean classifyDocument(DocumentID documentID, DocumentInterface document);
 
-    public void startPass(int pass);
+    public void startClassifierPass(int pass);
 
     public int getClassifierPasses();
 
-    public void endPass(int pass);
+    public void endClassifierPass(int pass);
 
     /**

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/ClassifierManager.java

@@ -1 +1 @@
 package org.greenstone.gsdl3.gs3build.classifier;
+
+import java.util.Iterator;
 
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentID;
@@ -36 +38 @@
     }
 
-    /**
-     *  Classify all the documents that the document list is able to provide...
-     */
-    public void classifyDocuments()
-    {   for (int i = 0; i < this.used; i ++)
-        {   for (int p = 0; p < this.list[i].getClassifierPasses(); p ++)
-            {   this.list[i].startPass(p);
-                for (int d = 0; d < this.documents.size(); d ++)
-                {   this.list[i].classifyDocument(null, documents.getDocument(d));
-                }
-                this.list[i].endPass(p);
-            }
-            this.list[i].completeClassification();
-        }
+  /**
+   *  Classify all the documents that the document list is able to provide...
+   */
+  public void classifyDocuments()
+  { for (int i = 0; i < this.used; i ++)
+    { for (int p = 0; p < this.list[i].getClassifierPasses(); p ++)
+      { this.list[i].startClassifierPass(p);
+
+    Iterator iterator = this.documents.iterator();
+
+    while (iterator.hasNext()) {
+      DocumentInterface document = (DocumentInterface) iterator.next();
+
+      if (document.isIndexed()) {
+        if (!this.list[i].classifyDocument(document.getID(), document)) {
+          System.out.println("Ending document");
+        }
+      }
     }
+    this.list[i].endClassifierPass(p);
+      }
+      this.list[i].completeClassification();
+    }
+  }
 
-    public void ensureSize(int size)
-    {   while (size >= this.size)
-        {   ClassifierInterface newList [] = new ClassifierInterface[this.size*2];
-            this.size *= 2;
-            System.arraycopy(this.list, 0, newList, 0, this.size);
-            this.list = newList;
-        }
-    }
+  public void ensureSize(int size)
+  { while (size >= this.size)
+    { ClassifierInterface newList [] = new ClassifierInterface[this.size*2];
+      this.size *= 2;
+      System.arraycopy(this.list, 0, newList, 0, this.size);
+      this.list = newList;
+    }
+  }
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/HierarchyClassifier.java

@@ -277 +277 @@
      *  @param <code>DocumentInterface</code> the document interface
      */
-    public void classifyDocument(DocumentID documentID, DocumentInterface document)
+    public boolean classifyDocument(DocumentID documentID, DocumentInterface document)
     { // the observer records the assignment of documents to classifications
         HierarchyClassifierObserver classifyObserver = new HierarchyClassifierObserver(document);
@@ -298 +298 @@
             this.hierarchy.getClassifications(documentID, values, classifyObserver);
         }
+        return true;
     }
 
@@ -304 +305 @@
     }
 
-    public void startPass(int pass)
+    public void startClassifierPass(int pass)
     {
     }
 
-    public void endPass(int pass)
+    public void endClassifierPass(int pass)
     {
     }