Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
JCL
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lafabregue
JCL
Commits
14880188
Commit
14880188
authored
Apr 19, 2018
by
balanche
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correction d'un bug sur la progress bar Sampling et d'un autre bug sur la progress bar Displaying
parent
180e6605
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
src/jcl/Classification.java
src/jcl/Classification.java
+2
-0
src/jcl/evaluation/clustering/ClusteringEvaluation.java
src/jcl/evaluation/clustering/ClusteringEvaluation.java
+10
-4
No files found.
src/jcl/Classification.java
View file @
14880188
...
...
@@ -35,6 +35,8 @@ import jcl.utils.exceptions.MethodNotImplementedException;
* </p>
*
* @author WEMMERT Cedric
*
* Implementation progressable par jean-Noël Balanche
*/
public
abstract
class
Classification
extends
Observable
implements
...
...
src/jcl/evaluation/clustering/ClusteringEvaluation.java
View file @
14880188
...
...
@@ -1170,7 +1170,6 @@ public class ClusteringEvaluation {
int CPindex = 2;
ClusteringResult clusteringResult = classification.getClusteringResult();
Iterator<DataObject> iter = clusteringResult.getData().getWholeSourceDataObjects();
// initialization for WG
...
...
@@ -1184,11 +1183,13 @@ public class ClusteringEvaluation {
for (int k = 0; k < clusteringResult.getNbClusters(); k++) {
clustersSE[k] = 0;
}
double step = 100./clusteringResult.getNbObjects();
double progress = classification.getProgress()+step;
for(int n = 0 ; iter.hasNext() ; n++) {
DataObject object = iter.next();
int currentCluster = clusteringResult.getClusterMap(false)[n];
int currentCluster = clusteringResult.getClusterMap(false)[n];
// compute for WG
double distMinWG = Double.MAX_VALUE;
...
...
@@ -1212,7 +1213,12 @@ public class ClusteringEvaluation {
// compute for Square Error
final double distanceSE = clusteringResult.getCluster(currentCluster).distance(currentCluster);
qualities[SEindex] += (distanceSE * distanceSE);
/*
* increments classification's progressable (for the "Displaying" step)
*/
progress+=step;
classification.setProgress((int)progress);
}
// merge result for WG
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment