|
|
|
@ -207,7 +207,6 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
private ListChangeListener<String> alsoVisualizeListener;
|
|
|
|
|
private ListChangeListener<String> collocabilityListener;
|
|
|
|
|
private ChangeListener<String> calculateForListener;
|
|
|
|
|
private InvalidationListener progressBarListener;
|
|
|
|
|
|
|
|
|
|
// private static final ObservableList<String> N_GRAM_COMPUTE_FOR_WORDS = FXCollections.observableArrayList("lema", "različnica", "oblikoskladenjska oznaka");
|
|
|
|
|
// private static final ObservableList<String> N_GRAM_COMPUTE_FOR_LETTERS = FXCollections.observableArrayList("lema", "različnica");
|
|
|
|
@ -917,7 +916,8 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
@SuppressWarnings("Duplicates")
|
|
|
|
|
@Override
|
|
|
|
|
protected Void call() throws Exception {
|
|
|
|
|
if(corpusFiles.size() > 1){
|
|
|
|
|
final boolean multipleFiles = CorpusType.multipleFilesCorpuses().contains(statistic.getCorpus().getCorpusType());
|
|
|
|
|
if(multipleFiles){
|
|
|
|
|
cancel.setVisible(true);
|
|
|
|
|
}
|
|
|
|
|
int i = corpusFiles.size();
|
|
|
|
@ -934,7 +934,10 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
final int iFinal = i;
|
|
|
|
|
XML_processing xml_processing = new XML_processing();
|
|
|
|
|
i++;
|
|
|
|
|
if (corpusFiles.size() > 1) {
|
|
|
|
|
if(xml_processing.progressBarListener != null) {
|
|
|
|
|
xml_processing.progressProperty().removeListener(xml_processing.progressBarListener);
|
|
|
|
|
}
|
|
|
|
|
if (multipleFiles) {
|
|
|
|
|
if ((new Date()).getTime() - previousTime.getTime() > 500 || remainingSeconds == -1){
|
|
|
|
|
remainingSeconds = (int) (((new Date()).getTime() - startTime.getTime()) * (1.0/i) * (corpusSize - i) / 1000);
|
|
|
|
|
previousTime = new Date();
|
|
|
|
@ -946,11 +949,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
// break;
|
|
|
|
|
// }
|
|
|
|
|
} else {
|
|
|
|
|
if(progressBarListener != null) {
|
|
|
|
|
xml_processing.progressProperty().removeListener(progressBarListener);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
progressBarListener = new InvalidationListener() {
|
|
|
|
|
xml_processing.progressBarListener = new InvalidationListener() {
|
|
|
|
|
int remainingSeconds = -1;
|
|
|
|
|
Date previousTime = new Date();
|
|
|
|
|
@Override
|
|
|
|
@ -972,7 +971,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
xml_processing.progressProperty().addListener(progressBarListener);
|
|
|
|
|
xml_processing.progressProperty().addListener(xml_processing.progressBarListener);
|
|
|
|
|
}
|
|
|
|
|
xml_processing.isCollocability = true;
|
|
|
|
|
xml_processing.readXML(f.toString(), statisticsOneGrams);
|
|
|
|
@ -1078,7 +1077,8 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
@SuppressWarnings("Duplicates")
|
|
|
|
|
@Override
|
|
|
|
|
protected Void call() throws Exception {
|
|
|
|
|
if(corpusFiles.size() > 1){
|
|
|
|
|
final boolean multipleFiles = CorpusType.multipleFilesCorpuses().contains(statistic.getCorpus().getCorpusType());
|
|
|
|
|
if(multipleFiles){
|
|
|
|
|
cancel.setVisible(true);
|
|
|
|
|
}
|
|
|
|
|
int i = 0;
|
|
|
|
@ -1094,8 +1094,12 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
for (File f : corpusFiles) {
|
|
|
|
|
final int iFinal = i;
|
|
|
|
|
XML_processing xml_processing = new XML_processing();
|
|
|
|
|
xml_processing.isCancelled = false;
|
|
|
|
|
i++;
|
|
|
|
|
if (corpusFiles.size() > 1) {
|
|
|
|
|
if(xml_processing.progressBarListener != null) {
|
|
|
|
|
xml_processing.progressProperty().removeListener(xml_processing.progressBarListener);
|
|
|
|
|
}
|
|
|
|
|
if (multipleFiles) {
|
|
|
|
|
if ((new Date()).getTime() - previousTime.getTime() > 500 || remainingSeconds == -1){
|
|
|
|
|
remainingSeconds = (int) (((new Date()).getTime() - startTime.getTime()) * (1.0/i) * (corpusSize - i) / 1000);
|
|
|
|
|
previousTime = new Date();
|
|
|
|
@ -1107,11 +1111,7 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
// break;
|
|
|
|
|
// }
|
|
|
|
|
} else {
|
|
|
|
|
if(progressBarListener != null) {
|
|
|
|
|
xml_processing.progressProperty().removeListener(progressBarListener);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
progressBarListener = new InvalidationListener() {
|
|
|
|
|
xml_processing.progressBarListener = new InvalidationListener() {
|
|
|
|
|
int remainingSeconds = -1;
|
|
|
|
|
Date previousTime = new Date();
|
|
|
|
|
@Override
|
|
|
|
@ -1133,14 +1133,14 @@ public class StringAnalysisTabNew2 {
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
xml_processing.progressProperty().addListener(progressBarListener);
|
|
|
|
|
xml_processing.progressProperty().addListener(xml_processing.progressBarListener);
|
|
|
|
|
}
|
|
|
|
|
xml_processing.readXML(f.toString(), statistic);
|
|
|
|
|
if (isCancelled()) {
|
|
|
|
|
updateMessage(I18N.get("message.CANCELING_NOTIFICATION"));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if(!(corpusFiles.size() > 1)){
|
|
|
|
|
if(!(multipleFiles)){
|
|
|
|
|
cancel.setVisible(false);
|
|
|
|
|
}
|
|
|
|
|
// readXML(f.toString(), statistic);
|
|
|
|
|