Changeset 8284 for trunk/greenstone3-extensions/vishnu

Timestamp:

2004-10-12T11:31:49+13:00 (20 years ago)

Author:

kjdon

Message:

some changes made to make this work with daniel's new server code. mostly to do with matrix changing from int [][] to float [][]

Location:

trunk/greenstone3-extensions/vishnu/src/vishnu/testvis

Files:

• dendro/Clustering.java (modified) (3 diffs)
• dendro/TreePanel.java (modified) (2 diffs)
• object/DataManager.java (modified) (3 diffs)
• object/DocObj.java (modified) (1 diff)
• object/GSDLEngine.java (modified) (1 diff)
• visual/CvManyPoints.java (modified) (1 diff)
• visual/HitCluster.java (modified) (2 diffs)

trunk/greenstone3-extensions/vishnu/src/vishnu/testvis/dendro/Clustering.java

@@ -34 +34 @@
 
 
-    public Clustering (DataManager dm, int linkage, int [][]m,
+    public Clustering (DataManager dm, int linkage, float [][]m,
                int num_of_vectors,
                int arraySize, int min_c_items,
@@ -53 +53 @@
     
     double[] heights;
-    double [][] vectors = intToDoubleMatrix(m);
+    double [][] vectors = floatToDoubleMatrix(m);//intToDoubleMatrix(m);
     //int [] coding = new int[m.length];
         
@@ -214 +214 @@
         return res;
    }
+    static double[][] floatToDoubleMatrix(float [][] m)
+    {
+        int h=m.length;
+        double [][] res = null;
+        if (h > 0)
+        {
+          int w = m[0].length;
+          res = new double[h][w];
+          for(int c=0;c<h;c++)
+            for(int d = 0; d<w; d++)
+              res[c][d]=(double)m[c][d];
+        }
+        return res;
+   }
 
 

trunk/greenstone3-extensions/vishnu/src/vishnu/testvis/dendro/TreePanel.java

@@ -375 +375 @@
         }
         
-        int [][] full = m.getExpanded(); 
-        
+        //int [][] full = m.getExpanded(); 
+        float [][] full = m.getExpanded(); 
         // the number of new clusters generated is either 20
         // or if there are not many docs half the #docs
@@ -385 +385 @@
                       
         Clustering clustering = new Clustering(dataManager,Clustering.COMPLETE_LINKAGE,
-                                                    full,m.getRowCount(),
-                                                    m.getColumnCount(),1,
-                                                    clusterNum,limit);
+                           full,m.getRowCount(),
+                           m.getColumnCount(),1,
+                           clusterNum,limit);
           
         root = clustering.getRoot();

trunk/greenstone3-extensions/vishnu/src/vishnu/testvis/object/DataManager.java

@@ -10 +10 @@
 
 import vishnu.testvis.sammon.*;
-import vishnu.sammon.Sammon;
+import vishnu.util.Sammon;
 import vishnu.cluster.Clustering;
 import vishnu.testvis.browser.*;
@@ -496 +496 @@
         }
         
-        int [][] full = m.getExpanded(); 
+        float [][] full = m.getExpanded(); 
         
         // the number of new clusters generated is either 20
@@ -507 +507 @@
                       
         Clustering clustering = new Clustering(Clustering.COMPLETE_LINKAGE,
-                                                    full,m.getRowCount(),
-                                                    m.getColumnCount(),1,
-                                                    clusterNum,limit);
+                           full,/*m.getRowCount(),
+                              m.getColumnCount(),*/1,
+                           clusterNum,limit);
                                                     
-        Vector [] clusters = clustering.getTheResults();
-        double [][] centroids= clustering.getTheCentroids();
+        Vector [] clusters = clustering.getClusters();
+        double [][] centroids= clustering.getCentroids();
 
         Sammon map = new Sammon(centroids);

trunk/greenstone3-extensions/vishnu/src/vishnu/testvis/object/DocObj.java

@@ -43 +43 @@
         return _weights;
     }
-    public int getWeights(int i)
+    public float getWeights(int i)
     {
         SparseNode test = _weights;

trunk/greenstone3-extensions/vishnu/src/vishnu/testvis/object/GSDLEngine.java

@@ -6 +6 @@
 import vishnu.testvis.visual.*;
 import vishnu.server.Packaging;
-import vishnu.server.XMLUtil;
+import vishnu.util.XMLUtil;
 
 import org.w3c.dom.Element;

trunk/greenstone3-extensions/vishnu/src/vishnu/testvis/visual/CvManyPoints.java

@@ -99 +99 @@
     protected MapKeyWords mapping;
     /** A two dimensional array of integers used for clustering */
-    protected int [][] fullMatrix;
+    //protected int [][] fullMatrix;
+    protected float [][] fullMatrix;
     /** array of data to draw target */
     protected int circles[][] = new int[maxCircleCount][4];

trunk/greenstone3-extensions/vishnu/src/vishnu/testvis/visual/HitCluster.java

@@ -13 +13 @@
     static final int EMPTYARRAY[] = {};
     static int matrix[][];
-    static int data[][];
+    // static int data[][];
+    static float data [][];
     static int clusters[][];
     static int keywords[];
@@ -106 +107 @@
     }
 
-    static int[] maximunDistance (int[][] newData, int[] newKeywords, int documentCount)
+    static int[] maximunDistance (float[][] newData, int[] newKeywords, int documentCount)
     {
         data = newData;