Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit c06e1ac1 authored by VERNIER HARRISON's avatar VERNIER HARRISON
Browse files

correctif demo

parent db60d5b8
......@@ -610,7 +610,7 @@ public class ConstraintsSelectionFrame extends JFrame implements ImageAddOn {
*/
private void initializeConstraintsColors() {
try {
imagePixel = ImageIO.read(inputImage);
imagePixel = ImageIO.read(getClass().getResource("/icons/icon-pince.png"));
imagePixelML = clone(imagePixel);
imagePixelCL = clone(imagePixel);
} catch (IOException e1) {
......
......@@ -29,6 +29,7 @@ import jcl.data.Data;
import jcl.data.DataObject;
import jcl.data.SimpleData;
import jcl.data.attribute.AttributeMultiDimSequence;
import jcl.data.attribute.AttributeNumerical;
import jcl.data.attribute.AttributeSequence;
import jcl.data.distance.DistanceModel;
import jcl.data.distance.DistanceParameter;
......@@ -249,7 +250,15 @@ public class CSVToDataDialog extends JInternalFrame implements ToUpdateObject {
for(int j =0 ; j<valueObject.length ; j++) {
valueObject[j] = dimValue.get(j);
}
if(seqMode.isSelected()) {
/*if(valueObject.length <2) {
int largeur = valueObject[0].length;
for(int numAttr=0; numAttr<largeur ; numAttr++) {
object.setAttribute(numAttr, new AttributeNumerical(valueObject[0][numAttr]));
}
}*/
if(seqMode.isSelected()) {
int longeur = valueObject.length;
int largeur = valueObject[0].length;
int countNull;
......
......@@ -58,11 +58,11 @@ public class DrawClusters2D implements DrawScatter2D {
JFreeChart scatterPlotChart = ChartFactory.createScatterPlot("Clusters" ,"X" ,"Y",
result , PlotOrientation.VERTICAL,true,true,false);
// scatterPlotChart.removeLegend();
//scatterPlotChart.removeLegend();
XYPlot xyPlot = (XYPlot) scatterPlotChart.getPlot();
scatterPlotChart.getLegend().setPosition(RectangleEdge.LEFT);
Shape cross = ShapeUtilities.createDiagonalCross(3, 1);
Shape circle = new Ellipse2D.Float(-2,-2,5,5);
......
......@@ -9,6 +9,7 @@ import jcl.Classification;
import jcl.clustering.ClusteringResult;
import jcl.data.DataObject;
import jcl.learning.methods.monostrategy.SingleClassification;
import jcl.learning.methods.monostrategy.ahc.ClassifierAHC;
import jcl.learning.methods.multistrategy.samarah2.HybridClassification;
public class ObjectOrder {
......@@ -42,7 +43,7 @@ public class ObjectOrder {
ClusteringResult clusteringResult = classif.getClusteringResult();
tabClusterDistance = new double[classif.getNbClusters()][][];
for(int i=0 ; i<classif.getNbClusters() ; i++) {
if(classif.getLearningMethod() == null && classif.getClusteringResult().getClusterMap().length > classif.getData().getViewDataObjects().size()) {
if(classif.getLearningMethod() == null && classif.getClusteringResult().getClusterMap().length > classif.getData().getViewDataObjects().size()) {
tabClusterDistance[i] = new double[classif.getClusteringResult().getCluster(i).getData(true,realClusterMap).getViewDataObjects().size()][2];
}else {
tabClusterDistance[i] = new double[classif.getClusteringResult().getCluster(i).getData(true).getViewDataObjects().size()][2];
......
......@@ -45,6 +45,7 @@ import jcl.learning.LearningMethod;
import jcl.learning.LearningParameters;
import jcl.learning.LearningResult;
import jcl.learning.methods.monostrategy.SingleClassification;
import jcl.learning.methods.monostrategy.ahc.ClassifierAHC;
import jcl.learning.methods.monostrategy.ahc.LearningResultAHC;
import jcl.learning.methods.monostrategy.ahc.ParametersAHC;
import mustic.gui.ClassificationImage;
......@@ -220,7 +221,11 @@ public class ResultPanel extends JPanel implements TreeSelectionListener {
public ResultPanel(Classification classification, ClassificationModel frame) {
super();
ClusteringResult tmp = classification.getClusteringResult();
objOrder = new ObjectOrder(classification);
if(classification.getLearningMethod() instanceof ClassifierAHC ) {
objOrder = null;
}
else
objOrder = new ObjectOrder(classification);
init(classification, frame);
test = frame;
......@@ -503,11 +508,13 @@ public class ResultPanel extends JPanel implements TreeSelectionListener {
/******************************************************************/
/******************************************************************/
this.mainpanel = new ProjectionPanel(this.classification, this);
if(objOrder != null)
this.mainpanel = new ProjectionPanel(this.classification, this);
/******************************************************************/
/******************************************************************/
this.heatmappanel = new SimilarityHeatMapPanel(this.classification,this);
if(objOrder != null)
this.heatmappanel = new SimilarityHeatMapPanel(this.classification,this);
/******************************************************************/
//this.goodScatterPlotPanel = new GoodScatterPlotChart(this.classification);
......@@ -520,13 +527,14 @@ public class ResultPanel extends JPanel implements TreeSelectionListener {
/********************************************************************/
/* Scatter plot */
//new ProjectionThread(this.classification, this,resultTabbedPane).start();
this.resultTabbedPane.add(this.mainpanel, "Main Panel");
if(objOrder != null)
this.resultTabbedPane.add(this.mainpanel, "Main Panel");
/***********************************************************************/
/********************************************************************/
/* SimilarityHeatMap */
this.resultTabbedPane.add(this.heatmappanel, "Similarity HeatMap");
if(objOrder != null)
this.resultTabbedPane.add(this.heatmappanel, "Similarity HeatMap");
/***********************************************************************/
......
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