!39 增加切割参数异常报错

Merge pull request !39 from 逐光/test

src/main/java/org/wlld/MatrixTools/MatrixOperation.java

@@ -28,7 +28,7 @@ public class MatrixOperation {
     }
 
     //矩阵相减
-    public static Matrix sub(Matrix matrix1, Matrix matrix2) throws Exception {//矩阵相加
+    public static Matrix sub(Matrix matrix1, Matrix matrix2) throws Exception {//
         if (matrix1.getX() == matrix2.getX() && matrix1.getY() == matrix2.getY()) {
             Matrix matrix = new Matrix(matrix1.getX(), matrix1.getY());
             int x = matrix1.getX();
@@ -422,6 +422,14 @@ public class MatrixOperation {
         }
     }
 
+    public static void mathSub(Matrix matrix, double nub) throws Exception {//矩阵数减
+        for (int i = 0; i < matrix.getX(); i++) {
+            for (int j = 0; j < matrix.getY(); j++) {
+                matrix.setNub(i, j, matrix.getNumber(i, j) - nub);
+            }
+        }
+    }
+
     public static void mathDiv(Matrix matrix, double nub) throws Exception {//矩阵数除
         for (int i = 0; i < matrix.getX(); i++) {
             for (int j = 0; j < matrix.getY(); j++) {

src/main/java/org/wlld/imageRecognition/Convolution.java

@@ -112,74 +112,24 @@ public class Convolution extends Frequency {
         Matrix matrixB = threeChannelMatrix.getMatrixB();
         int x = matrixR.getX();
         int y = matrixR.getY();
-        Matrix matrixRFilter = new Matrix(x, y);//滤波后的R通道
-        Matrix matrixGFilter = new Matrix(x, y);//滤波后的G通道
-        Matrix matrixBFilter = new Matrix(x, y);//滤波后的B通道
-        int row = 0;
-        int column = 0;
-        for (int i = 0; i < x; i++) {
-            for (int j = 0; j < y; j++) {
+        double nub = x * y;
         double sigmaR = 0;
         double sigmaG = 0;
         double sigmaB = 0;
-                double nub = 0;
-                for (int t = 0; t < 8; t++) {
-                    row = 0;
-                    column = 0;
-                    switch (t) {
-                        case 0://上
-                            row = i - 1;
-                            break;
-                        case 1://左
-                            column = j - 1;
-                            break;
-                        case 2://下
-                            row = i + 1;
-                            break;
-                        case 3://右
-                            column = j + 1;
-                            break;
-                        case 4://左上
-                            column = j - 1;
-                            row = i - 1;
-                            break;
-                        case 5://左下
-                            column = j - 1;
-                            row = i + 1;
-                            break;
-                        case 6://右下
-                            column = j + 1;
-                            row = i + 1;
-                            break;
-                        case 7://右上
-                            column = j + 1;
-                            row = i - 1;
-                            break;
-                    }
-                    if (row >= 0 && column >= 0 && row < x && column < y) {
-                        double r = matrixR.getNumber(row, column);
-                        double g = matrixG.getNumber(row, column);
-                        double b = matrixB.getNumber(row, column);
-                        sigmaR = sigmaR + r;
-                        sigmaG = sigmaG + g;
-                        sigmaB = sigmaB + b;
-                        nub++;
-                    }
-                }
-                double pixelR = sigmaR / nub;
-                double pixelG = sigmaG / nub;
-                double pixelB = sigmaB / nub;
-                matrixRFilter.setNub(i, j, pixelR);
-                matrixGFilter.setNub(i, j, pixelG);
-                matrixBFilter.setNub(i, j, pixelB);
-            }
-        }
-        Matrix rPic = MatrixOperation.matrixPointDiv(matrixR, matrixRFilter);
-        Matrix gPic = MatrixOperation.matrixPointDiv(matrixG, matrixGFilter);
-        Matrix bPic = MatrixOperation.matrixPointDiv(matrixB, matrixBFilter);
-        threeChannelMatrix.setMatrixR(rPic);
-        threeChannelMatrix.setMatrixG(gPic);
-        threeChannelMatrix.setMatrixB(bPic);
+        for (int i = 0; i < x; i++) {
+            for (int j = 0; j < y; j++) {
+                sigmaR = matrixR.getNumber(i, j) + sigmaR;
+                sigmaG = matrixG.getNumber(i, j) + sigmaG;
+                sigmaB = matrixB.getNumber(i, j) + sigmaB;
+            }
+        }
+        double r = sigmaR / nub;
+        double g = sigmaG / nub;
+        double b = sigmaB / nub;
+        MatrixOperation.mathDiv(matrixR, r);
+        MatrixOperation.mathDiv(matrixG, g);
+        MatrixOperation.mathDiv(matrixB, b);
+
     }
 
     public List<Double> getCenterColor(ThreeChannelMatrix threeChannelMatrix, int poolSize, int sqNub) throws Exception {

src/main/java/org/wlld/imageRecognition/Operation.java

@@ -61,6 +61,7 @@ public class Operation {//进行计算
     public void colorStudy(ThreeChannelMatrix threeChannelMatrix, int tag, List<Specifications> specificationsList) throws Exception {
         Watershed watershed = new Watershed(threeChannelMatrix.getMatrixRGB(), specificationsList, templeConfig);
         List<RegionBody> regionBodies = watershed.rainfall();
+        if (regionBodies.size() == 1) {
             RegionBody regionBody = regionBodies.get(0);
             int minX = regionBody.getMinX() + dif;
             int minY = regionBody.getMinY() + dif;
@@ -69,7 +70,7 @@ public class Operation {//进行计算
             int xSize = maxX - minX;
             int ySize = maxY - minY;
             ThreeChannelMatrix threeChannelMatrix1 = convolution.getRegionMatrix(threeChannelMatrix, minX, minY, xSize, ySize);
-        // convolution.filtering(threeChannelMatrix1);//光照过滤
+            //convolution.filtering(threeChannelMatrix1);//光照过滤
             int times = templeConfig.getFood().getTimes();
             for (int i = 0; i < times; i++) {
                 List<Double> feature = convolution.getCenterColor(threeChannelMatrix1, templeConfig.getPoolSize(),
@@ -103,6 +104,9 @@ public class Operation {//进行计算
                         break;
                 }
             }
+        } else {
+            throw new Exception("Parameter exception");
+        }
     }
 
     private void knnStudy(int tagging, Matrix vector) throws Exception {