临时注释掉剪切边角

pull/44/head
lidapeng 5 years ago
parent 2f55a43465
commit 09b68cad98

@ -216,12 +216,11 @@ public class Watershed {
for (Specifications specification : specifications) { for (Specifications specification : specifications) {
int width = maxY - minY; int width = maxY - minY;
int height = maxX - minX; int height = maxX - minX;
double h = this.height / 8; // double h = this.height / 8;
double w = this.width / 8; // double w = this.width / 8;
boolean isCenter = true;// minX > h && minY > w && minX < (h * 4.5) && minY < (w * 4.5); // boolean isCenter = minX > h && minY > w && minX < (h * 4.5) && minY < (w * 4.5);
if (width >= specification.getMinWidth() && height >= specification.getMinHeight() if (width >= specification.getMinWidth() && height >= specification.getMinHeight()
&& width <= specification.getMaxWidth() && height <= specification.getMaxHeight() && width <= specification.getMaxWidth() && height <= specification.getMaxHeight()) {
&& isCenter) {
isRight = true; isRight = true;
break; break;
} }

@ -21,13 +21,13 @@ import java.util.List;
public class FoodTest { public class FoodTest {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
ModelParameter parameter = JSON.parseObject(ModelData.DATA, ModelParameter.class); // ModelParameter parameter = JSON.parseObject(ModelData.DATA, ModelParameter.class);
if (parameter.getKnnVector() != null) { // if (parameter.getKnnVector() != null) {
System.out.println("空的"); // System.out.println("空的");
} else { // } else {
System.out.println("不是空==="); // System.out.println("不是空===");
} // }
//test(); test();
} }
public static void one(double[] test, double[] right, double[] wrong) { public static void one(double[] test, double[] right, double[] wrong) {
@ -112,12 +112,22 @@ public class FoodTest {
for (int i = 1; i <= 1; i++) { for (int i = 1; i <= 1; i++) {
ThreeChannelMatrix threeChannelMatrix1 = picture.getThreeMatrix("/Users/lidapeng/Documents/paramterTest/a" + i + ".jpg"); ThreeChannelMatrix threeChannelMatrix1 = picture.getThreeMatrix("/Users/lidapeng/Documents/paramterTest/a" + i + ".jpg");
ThreeChannelMatrix threeChannelMatrix2 = picture.getThreeMatrix("/Users/lidapeng/Documents/paramterTest/b" + i + ".jpg"); ThreeChannelMatrix threeChannelMatrix2 = picture.getThreeMatrix("/Users/lidapeng/Documents/paramterTest/b" + i + ".jpg");
operation.colorStudy(threeChannelMatrix1, 1, specificationsList); operation.colorStudy(threeChannelMatrix1, 83, specificationsList);
System.out.println("======================================="); System.out.println("=======================================");
operation.colorStudy(threeChannelMatrix2, 2, specificationsList); operation.colorStudy(threeChannelMatrix2, 86, specificationsList);
System.out.println("=======================================" + i); System.out.println("=======================================" + i);
} }
test2(templeConfig); ModelParameter modelParameter = templeConfig.getModel();
if (modelParameter.getKnnVector() != null) {
System.out.println("not null 1");
}
String tr = JSON.toJSONString(modelParameter);
System.out.println(tr);
ModelParameter modelParameter1 = JSON.parseObject(tr, ModelParameter.class);
if (modelParameter1.getKnnVector() != null) {
System.out.println("not null 2");
}
//test2(templeConfig);
} }
public static void study() throws Exception { public static void study() throws Exception {

Loading…
Cancel
Save