Commit 27189188 authored by lafabregue's avatar lafabregue

interface fixes

parent 60fbe89d
......@@ -54,7 +54,6 @@ import mustic.utils.image.ZoomBoxPanel;
import mustic.utils.image.Zoomable;
import mustic.utils.image.viewer.ClusteringImageViewer;
import mustic.utils.image.viewer.GDALPyramidImageViewer;
import mustic.utils.image.viewer.ImageViewer;
import mustic.utils.image.viewer.MultiResolutionClusterMap;
import org.apache.batik.svggen.SVGGraphics2DIOException;
......@@ -1162,6 +1161,9 @@ public class ImageResultPanel extends ResultPanel implements TreeSelectionListen
eval.calGamma(((HybridClassification) classification).getAgents(),
((HybridClassification) classification).getConfig(), null);
out3.println(Arrays.deepToString(eval.omega));
out3.close();
bw3.close();
fw3.close();
File concoredenceFile = new File(concordenceFilePath);
Packager.zipFile(out, name + "/"+concordenceFilePath, concoredenceFile);
}
......@@ -1190,42 +1192,42 @@ public class ImageResultPanel extends ResultPanel implements TreeSelectionListen
// oos.flush();
// out.closeEntry();
out.putNextEntry(new ZipEntry(name + '/' + "ClusterMapFull.ser"));
oos = new ObjectOutputStream(out);
oos.writeObject(imgPanel.classification.getClusteringResult().getClusterMap(false));
oos.flush();
out.closeEntry();
out.putNextEntry(new ZipEntry(name + '/' + "WeightsFull.ser"));
oos = new ObjectOutputStream(out);
oos.writeObject(imgPanel.result.getWeights());
oos.flush();
out.closeEntry();
out.putNextEntry(new ZipEntry(name + '/' + "MethodFull.ser"));
oos = new ObjectOutputStream(out);
oos.writeObject(imgPanel.classification.getLearningMethod());
oos.flush();
out.closeEntry();
out.putNextEntry(new ZipEntry(name + '/' + "DataFull.ser"));
oos = new ObjectOutputStream(out);
oos.writeObject(imgPanel.result.getData().getViewDataObjects());
oos.flush();
out.closeEntry();
if (imgPanel.qualityPanel != null && imgPanel.qualityPanel.getQualities() != null) {
out.putNextEntry(new ZipEntry(name + '/' + "QualityFull.ser"));
oos = new ObjectOutputStream(out);
oos.writeObject(imgPanel.qualityPanel.getQualities());
oos.flush();
out.closeEntry();
}
out.putNextEntry(new ZipEntry(name + '/' + "ParameterSimplify.ser"));
oos = new ObjectOutputStream(out);
oos.writeObject(AttributeMultiDimSequence.getSimplifyFrom());
oos.flush();
// out.putNextEntry(new ZipEntry(name + '/' + "ClusterMapFull.ser"));
// oos = new ObjectOutputStream(out);
// oos.writeObject(imgPanel.classification.getClusteringResult().getClusterMap(false));
// oos.flush();
// out.closeEntry();
//
// out.putNextEntry(new ZipEntry(name + '/' + "WeightsFull.ser"));
// oos = new ObjectOutputStream(out);
// oos.writeObject(imgPanel.result.getWeights());
// oos.flush();
// out.closeEntry();
//
// out.putNextEntry(new ZipEntry(name + '/' + "MethodFull.ser"));
// oos = new ObjectOutputStream(out);
// oos.writeObject(imgPanel.classification.getLearningMethod());
// oos.flush();
// out.closeEntry();
//
// out.putNextEntry(new ZipEntry(name + '/' + "DataFull.ser"));
// oos = new ObjectOutputStream(out);
// oos.writeObject(imgPanel.result.getData().getViewDataObjects());
// oos.flush();
// out.closeEntry();
//
// if (imgPanel.qualityPanel != null && imgPanel.qualityPanel.getQualities() != null) {
// out.putNextEntry(new ZipEntry(name + '/' + "QualityFull.ser"));
// oos = new ObjectOutputStream(out);
// oos.writeObject(imgPanel.qualityPanel.getQualities());
// oos.flush();
// out.closeEntry();
// }
//
// out.putNextEntry(new ZipEntry(name + '/' + "ParameterSimplify.ser"));
// oos = new ObjectOutputStream(out);
// oos.writeObject(AttributeMultiDimSequence.getSimplifyFrom());
// oos.flush();
out.closeEntry();
}
}
......
......@@ -381,11 +381,11 @@ public class HybridClassificationSubParametersPanel extends JPanel {
// parametre qualite/similitude
jSpinnerPqPs1.setValue(samarah.config.importanceQualite);
jSpinnerPqPs1.setValue(1-samarah.config.importanceQualite);
jSpinnerPqPs2.setValue(1-samarah.config.importanceQualite);
jSpinnerConstraints1.setValue(samarah.config.importance_constraints);
jSpinnerConstraints2.setValue(1 - samarah.config.importance_constraints);
jSpinnerPePi1.setValue(samarah.config.importance_Kexterne /(1-samarah.config.importance_constraints));
jSpinnerPePi1.setValue(1 - samarah.config.importance_Kexterne /(1-samarah.config.importance_constraints));
jSpinnerPePi2.setValue(1 - samarah.config.importance_Kexterne /(1-samarah.config.importance_constraints));
jSpinnerSolutionType.setValue(samarah.config.typeSolution);
jSpinnerClassRatio.setValue(samarah.config.pourcentage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment