Changeset 3452

Timestamp:

09/01/10 10:43:07 (17 months ago)

Author:

jlops

Message:

IMatrix1 Interface geimplementeerd

Location:

molgenis_distro/3.5

Files:

• WebContent/WEB-INF/lib/eclipselink-jpa-modelgen_2.0.2.v20100323-r6872.jar (added)
• WebContent/WEB-INF/lib/eclipselink.jar (added)
• WebContent/WEB-INF/lib/javax.persistence_2.0.0.v201002051058.jar (added)
• handwritten/java/Matrix/DBMatrix.java (modified) (9 diffs)
• handwritten/java/Matrix/IMatrix1.java (added)
• handwritten/java/Matrix/MatrixBean.java (modified) (3 diffs)
• handwritten/java/Matrix/PagableDataModel.java (modified) (6 diffs)

molgenis_distro/3.5/handwritten/java/Matrix/DBMatrix.java

@@ -1 +1 @@
 package Matrix;
 
+import java.io.File;
+import java.io.PrintWriter;
 import java.lang.reflect.Array;
 import java.sql.SQLException;
@@ -13 +15 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.molgenis.framework.db.Database;
 import org.molgenis.framework.db.DatabaseException;
 import org.molgenis.framework.db.QueryRule;
@@ -20 +23 @@
 import app.JpaDatabase;
 
-public class DBMatrix<T> implements IMatrix<T> {
+public class DBMatrix<T> implements IMatrix1<T, Column, Integer> {
         private T[][] data;
         private static JpaDatabase db;
@@ -47 +50 @@
         }
         
-        @Override
+        
         public List<String> getColumnGroups() {
                 String ql = "SELECT DISTINCT SUBSTRING(oFeature.name, 1, LOCATE('.',oFeature.name) - 1) " +
@@ -79 +82 @@
         private boolean observationsLoaded = false;
         
-        @Override
         public void loadData(int numberOfRows, int offset) throws NumberFormatException, DatabaseException, SQLException, ParseException
         {
@@ -125 +127 @@
                                 QueryRule rule = new QueryRule(r); // copy because of side
                                 // effects
-                                // logger.debug(rule);
+                                // LogFactory.getLog(this.getClass()).debug(rule);
 
                                 // String tablePrefix = "";
@@ -426 +428 @@
         }
 
+/*
         @Override
         public List<Integer> getTargets() {
                 return this.observationTargetIds;
         }
+*/      
 
         public void addColumn(String columnName) {
@@ -435 +439 @@
         }
 
-        @Override
+/*      
         public int getNumberofTargets() {       
                 try {
@@ -444 +448 @@
                 return observationTargetIds.size();
         }
+*/      
+
+        @Override
+        public Class<T> getDataObject() {
+                // TODO Auto-generated method stub
+                return this.klass;
+        }
+
+        @Override
+        public int getNumberOfCols() {
+                // TODO Auto-generated method stub
+                return 0;
+        }
+
+        @Override
+        public int getNumberOfRows() {
+                try {
+                        loadObservationTargets();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                } 
+                return observationTargetIds.size();
+        }
+
+        @Override
+        public List<Integer> getRows() {
+                return this.observationTargetIds;
+        }
+
+        @Override
+        public T getElement(int rowIndex, int colIndex) throws Exception {
+                throw new UnsupportedOperationException();      }
+
+        @Override
+        public T getElement(String rowName, String colName) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public T[][] getElements() throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public T[] getCol(int colIndex) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public T[] getCol(String colName) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public int getColIndexForName(String colName) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public T[] getRow(int rowIndex) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public T[] getRow(String rowName) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public int getRowIndexForName(String rowName) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getSubMatrix(int[] rowIndices,
+                        int[] colIndices) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getSubMatrix(List<String> rowNames,
+                        List<String> colNames) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getSubMatrixByOffset(int row,
+                        int nRows, int col, int nCols) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getSubMatrixByOffset(String rowName,
+                        int nRows, String colName, int nCols) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getSubMatrixFilterByRowEntityValues(
+                        Database db, QueryRule... rules) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getSubMatrixFilterByRowMatrixValues(
+                        QueryRule... rules) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getSubMatrixFilterByColEntityValues(
+                        Database db, QueryRule... rules) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getSubMatrixFilterByColMatrixValues(
+                        QueryRule... rules) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getMatrixSortByRowEntityValues(
+                        boolean asc) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getMatrixSortByColEntityValues(
+                        boolean asc) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getMatrixSortByRowMatrixValues(
+                        boolean asc) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> getMatrixSortByColMatrixValues(
+                        boolean asc) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> performUnion(
+                        IMatrix1<T, Column, Integer> N) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> performIntersection(
+                        IMatrix1<T, Column, Integer> N) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> performDifference(
+                        IMatrix1<T, Column, Integer> N) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> performExclusion(
+                        IMatrix1<T, Column, Integer> N) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public IMatrix1<T, Column, Integer> performTransposition(
+                        IMatrix1<T, Column, Integer> N) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public File getAsExcelFile() throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public File getAsFile() throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void writeToCsvWriter(PrintWriter out) throws Exception {
+                throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void writeToPrintWriter(PrintWriter out) throws Exception {
+                throw new UnsupportedOperationException();              
+        }
+
+        @Override
+        public void addRow() throws Exception {
+                throw new UnsupportedOperationException();              
+        }
+
+        @Override
+        public void addColumn() throws Exception {
+                throw new UnsupportedOperationException();              
+        }
+
+        @Override
+        public void updateElement() throws Exception {
+                throw new UnsupportedOperationException();              
+        }
 }

molgenis_distro/3.5/handwritten/java/Matrix/MatrixBean.java

@@ -42 +42 @@
         
         private void loadObservableFeatureGroups() {
-                featureGroups = super.getMatrix().getColumnGroups();
+                featureGroups = ((DBMatrix)super.getMatrix()).getColumnGroups();
         }
         
         private void loadObservableFeatureNamesByGroup(String featureGroupName) {
-                features = super.getMatrix().getColumnsGroup(featureGroupName);
+                features = ((DBMatrix)super.getMatrix()).getColumnsGroup(featureGroupName);
         }
         
@@ -72 +72 @@
         public void sortColumn() {
                 super.sortColumn(sortColumnIndex);
-        }
-        
-        
+        }       
 
         public void filterChanged(ActionEvent ae) {
@@ -81 +79 @@
         
         public Collection<Integer> getTargets() {
-                return super.getMatrix().getTargets();
+                return super.getMatrix().getRows();
         }
         

molgenis_distro/3.5/handwritten/java/Matrix/PagableDataModel.java

@@ -27 +27 @@
     private boolean refresh = false; //refresh database if column or filter changes
 
-        private IMatrix<T> matrix;
+        private IMatrix1<T, Column, Integer> matrix;
         
-        public PagableDataModel(IMatrix<T> matrix) {
+        public PagableDataModel(IMatrix1<T, Column, Integer> matrix) {
                 this.matrix = matrix;
         }
@@ -55 +55 @@
 
             try {
-                matrix.loadData(numberOfRows, firstRow);
+                ((DBMatrix)matrix).loadData(numberOfRows, firstRow);
                 
                 Collection<Column> columns = matrix.getColumns();
@@ -64 +64 @@
                 
                 T[][] data = (T[][]) matrix.getData();
-                List<Integer> targets = matrix.getTargets();
+                List<Integer> targets = matrix.getRows();
 
-                int size = matrix.getTargets().size() < numberOfRows ? matrix.getTargets().size()
+                int size = matrix.getRows().size() < numberOfRows ? matrix.getRows().size()
                                 : numberOfRows;                 
                 for(int idx = 0; idx < size; ++idx) {
@@ -80 +80 @@
         }
         
-        int size = matrix.getTargets().size() < numberOfRows ? matrix.getTargets().size()
+        int size = matrix.getRows().size() < numberOfRows ? matrix.getRows().size()
                                 : numberOfRows;         
         for(int idx = 0; idx < size; ++idx) {
-                visitor.process(context, matrix.getTargets().get(idx), argument);
+                visitor.process(context, matrix.getRows().get(idx), argument);
         }
     }
@@ -118 +118 @@
         @Override
         public int getRowCount() {
-                return matrix.getNumberofTargets();
+                return matrix.getNumberOfRows();
         }
 
@@ -177 +177 @@
         }
         
-        public IMatrix<T> getMatrix() {
+        public IMatrix1<T, Column, Integer> getMatrix() {
                 return matrix;
         }