lkrsnik/list
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Added implementation of taxonomy set operations (intersection and union)

Browse Source
This commit is contained in:
Luka 2019-01-29 13:49:20 +01:00
parent b639e36961
commit acf2fb086b
13 changed files with 286 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/alg/XML_processing.java
View File

@ -858,11 +858,15 @@ public class XML_processing {
if (!ValidationUtil.isEmpty(stats.getFilter().getTaxonomy())) {
currentFiletaxonomy.retainAll(stats.getFilter().getTaxonomy()); // intersection
if (currentFiletaxonomy.isEmpty()) {
if (stats.getFilter().getTaxonomySetOperation().equals(I18N.get("taxonomySetOperation.UNION")) && currentFiletaxonomy.isEmpty()) {
// taxonomies don't match so stop
// union (select words that match any of selected taxonomy
// return false;
taxonomyMatch = false;
// System.out.println("TEST");
//
} else if(stats.getFilter().getTaxonomySetOperation().equals(I18N.get("taxonomySetOperation.INTERSECTION")) && currentFiletaxonomy.size() != stats.getFilter().getTaxonomy().size()){
// intersection (select only words that precisely match selected taxonomy
taxonomyMatch = false;
}
}
}
@ -1114,11 +1118,15 @@ public class XML_processing {
if (!ValidationUtil.isEmpty(stats.getFilter().getTaxonomy())) {
currentFiletaxonomy.retainAll(stats.getFilter().getTaxonomy()); // intersection
if (currentFiletaxonomy.isEmpty()) {
if (stats.getFilter().getTaxonomySetOperation().equals(I18N.get("taxonomySetOperation.UNION")) && currentFiletaxonomy.isEmpty()) {
// taxonomies don't match so stop
// union (select words that match any of selected taxonomy
// return false;
taxonomyMatch = false;
// System.out.println("TEST");
//
} else if(stats.getFilter().getTaxonomySetOperation().equals(I18N.get("taxonomySetOperation.INTERSECTION")) && currentFiletaxonomy.size() != stats.getFilter().getTaxonomy().size()){
// intersection (select only words that precisely match selected taxonomy
taxonomyMatch = false;
}
}
} else if (endElement.getName().getLocalPart().equals("text")){
@ -1400,13 +1408,29 @@ public class XML_processing {
} else if (endElement.getName().getLocalPart().equals("teiHeader")) {
// before proceeding to read this file, make sure that taxonomy filters are a match
// if (!ValidationUtil.isEmpty(stats.getFilter().getTaxonomy())) {
// currentFiletaxonomy.retainAll(stats.getFilter().getTaxonomy()); // intersection
//
// // disregard this entry if taxonomies don't match
// includeFile = !currentFiletaxonomy.isEmpty();
//
//// currentFiletaxonomy = new ArrayList<>();
// }
if (!ValidationUtil.isEmpty(stats.getFilter().getTaxonomy())) {
currentFiletaxonomy.retainAll(stats.getFilter().getTaxonomy()); // intersection
// disregard this entry if taxonomies don't match
includeFile = !currentFiletaxonomy.isEmpty();
// currentFiletaxonomy = new ArrayList<>();
if (stats.getFilter().getTaxonomySetOperation().equals(I18N.get("taxonomySetOperation.UNION")) && currentFiletaxonomy.isEmpty()) {
// taxonomies don't match so stop
// union (select words that match any of selected taxonomy
// return false;
includeFile = false;
//
} else if(stats.getFilter().getTaxonomySetOperation().equals(I18N.get("taxonomySetOperation.INTERSECTION")) && currentFiletaxonomy.size() != stats.getFilter().getTaxonomy().size()){
// intersection (select only words that precisely match selected taxonomy
includeFile = false;
} else {
includeFile = true;
}
}
}
@ -1580,8 +1604,14 @@ public class XML_processing {
if (!ValidationUtil.isEmpty(stats.getFilter().getTaxonomy())) {
currentFiletaxonomy.retainAll(stats.getFilter().getTaxonomy()); // intersection
if (currentFiletaxonomy.isEmpty()) {
// taxonomies don't match so don't save
if (stats.getFilter().getTaxonomySetOperation().equals(I18N.get("taxonomySetOperation.UNION")) && currentFiletaxonomy.isEmpty()) {
// taxonomies don't match so stop
// union (select words that match any of selected taxonomy
// return false;
taxonomyMatch = false;
//
} else if(stats.getFilter().getTaxonomySetOperation().equals(I18N.get("taxonomySetOperation.INTERSECTION")) && currentFiletaxonomy.size() != stats.getFilter().getTaxonomy().size()){
// intersection (select only words that precisely match selected taxonomy
taxonomyMatch = false;
}
}

9
src/main/java/data/Filter.java
View File

@ -29,6 +29,7 @@ public class Filter implements Cloneable {
NOTE_PUNCTUATIONS,
MINIMAL_OCCURRENCES,
MINIMAL_TAXONOMY,
TAXONOMY_SET_OPERATION,
COLLOCABILITY,
PREFIX_LENGTH,
SUFFIX_LENGTH,
@ -104,6 +105,14 @@ public class Filter implements Cloneable {
return (Integer) filter.get(STRING_LENGTH);
}
public void setTaxonomySetOperation(String taxonomySetOperation) {
filter.put(TAXONOMY_SET_OPERATION, taxonomySetOperation);
}
public String getTaxonomySetOperation() {
return (String) filter.get(TAXONOMY_SET_OPERATION);
}
public void setTaxonomy(ArrayList<Taxonomy> taxonomy) {
filter.put(TAXONOMY, taxonomy);
}

6
src/main/java/data/StatisticsNew.java
View File

@ -593,6 +593,12 @@ public class StatisticsNew {
info.put(I18N.get("exportHeader.msd"), "");
}
if (!isEmpty(filter.getTaxonomySetOperation())) {
info.put(I18N.get("exportHeader.taxonomySetOperation"), filter.getTaxonomySetOperation());
} else {
info.put(I18N.get("exportHeader.taxonomySetOperation"), "");
}
// }

35
src/main/java/gui/CharacterAnalysisTab.java
View File

@ -66,6 +66,9 @@ public class CharacterAnalysisTab {
@FXML
public Label minimalTaxonomyL;
@FXML
public Label taxonomySetOperationL;
@FXML
public ImageView stringLengthI;
@ -87,6 +90,9 @@ public class CharacterAnalysisTab {
@FXML
public ImageView minimalTaxonomyI;
@FXML
public ImageView taxonomySetOperationI;
@FXML
public Label solarFilters;
@ -119,6 +125,10 @@ public class CharacterAnalysisTab {
private TextField minimalTaxonomyTF;
private Integer minimalTaxonomy;
@FXML
private ComboBox<String> taxonomySetOperationCB;
private String taxonomySetOperation;
// @FXML
// private ToggleGroup calculateForRB;
// private CalculateFor calculateFor;
@ -169,6 +179,9 @@ public class CharacterAnalysisTab {
private static final String [] N_GRAM_COMPUTE_FOR_LETTERS_ARRAY = {"calculateFor.WORD", "calculateFor.LEMMA"};
private static final ArrayList<String> N_GRAM_COMPUTE_FOR_LETTERS = new ArrayList<>(Arrays.asList(N_GRAM_COMPUTE_FOR_LETTERS_ARRAY));
private static final String [] TAXONOMY_SET_OPERATION_ARRAY = {"taxonomySetOperation.UNION", "taxonomySetOperation.INTERSECTION"};
private static final ArrayList<String> TAXONOMY_SET_OPERATION = new ArrayList<>(Arrays.asList(TAXONOMY_SET_OPERATION_ARRAY));
// private static final ObservableList<String> N_GRAM_COMPUTE_FOR_LETTERS = FXCollections.observableArrayList("različnica", "lema");
private static final ObservableList<String> N_GRAM_COMPUTE_FOR_WORDS_ORTH = FXCollections.observableArrayList("različnica");
@ -211,6 +224,18 @@ public class CharacterAnalysisTab {
calculateForCB.getSelectionModel().select(0);
taxonomySetOperationCB.setDisable(true);
taxonomySetOperationCB.valueProperty().addListener((observable, oldValue, newValue) -> {
if(newValue == null){
newValue = I18N.getTranslatedValue(oldValue, TAXONOMY_SET_OPERATION);
taxonomySetOperationCB.getSelectionModel().select(newValue);
}
taxonomySetOperation = newValue;
logger.info("Taxonomy set operation:", taxonomySetOperation);
});
taxonomySetOperationCB.getSelectionModel().select(0);
// msd
msdTF.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (!newValue) {
@ -279,6 +304,12 @@ public class CharacterAnalysisTab {
for (Taxonomy t : checkedItemsTaxonomy) {
taxonomyCCB.getCheckModel().check(t.toLongNameString());
}
if (taxonomyCCB.getCheckModel().getCheckedItems().size() > 0) {
taxonomySetOperationCB.setDisable(false);
} else {
taxonomySetOperationCB.getSelectionModel().select(0);
taxonomySetOperationCB.setDisable(true);
}
changing = true;
logger.info(String.format("Selected taxonomy: %s", StringUtils.join(checkedItems, ",")));
}
@ -519,6 +550,7 @@ public class CharacterAnalysisTab {
taxonomyL.textProperty().bind(I18N.createStringBinding("label.taxonomy"));
minimalOccurrencesL.textProperty().bind(I18N.createStringBinding("label.minimalOccurrences"));
minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
taxonomySetOperationL.textProperty().bind(I18N.createStringBinding("label.taxonomySetOperation"));
addTooltipToImage(stringLengthI, I18N.createStringBinding("label.letter.stringLengthH"));
addTooltipToImage(calculateForI, I18N.createStringBinding("label.letter.calculateForH"));
@ -527,11 +559,13 @@ public class CharacterAnalysisTab {
addTooltipToImage(taxonomyI, I18N.createStringBinding("label.letter.taxonomyH"));
addTooltipToImage(minimalOccurrencesI, I18N.createStringBinding("label.letter.minimalOccurrencesH"));
addTooltipToImage(minimalTaxonomyI, I18N.createStringBinding("label.letter.minimalTaxonomyH"));
addTooltipToImage(taxonomySetOperationI, I18N.createStringBinding("label.letter.taxonomySetOperationH"));
solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
calculateForCB.itemsProperty().bind(I18N.createObjectBinding(N_GRAM_COMPUTE_FOR_LETTERS));
taxonomySetOperationCB.itemsProperty().bind(I18N.createObjectBinding(TAXONOMY_SET_OPERATION));
}
@ -595,6 +629,7 @@ public class CharacterAnalysisTab {
filter.setStringLength(stringLength);
filter.setMinimalOccurrences(minimalOccurrences);
filter.setMinimalTaxonomy(minimalTaxonomy);
filter.setTaxonomySetOperation(taxonomySetOperation);
String message = Validation.validateForStringLevel(filter);
if (message == null) {

36
src/main/java/gui/OneWordAnalysisTab.java
View File

@ -71,6 +71,9 @@ public class OneWordAnalysisTab {
@FXML
public Label minimalTaxonomyL;
@FXML
public Label taxonomySetOperationL;
@FXML
public ImageView calculateForI;
@ -95,6 +98,9 @@ public class OneWordAnalysisTab {
@FXML
public ImageView minimalTaxonomyI;
@FXML
public ImageView taxonomySetOperationI;
@FXML
private TextField msdTF;
private ArrayList<Pattern> msd;
@ -128,6 +134,10 @@ public class OneWordAnalysisTab {
private TextField minimalTaxonomyTF;
private Integer minimalTaxonomy;
@FXML
private ComboBox<String> taxonomySetOperationCB;
private String taxonomySetOperation;
@FXML
private Button computeNgramsB;
@ -201,6 +211,9 @@ public class OneWordAnalysisTab {
private static final String [] ALSO_VISUALIZE_ITEMS_EMPTY_ARRAY = {};
private static final ArrayList<String> ALSO_VISUALIZE_ITEMS_EMPTY = new ArrayList<>(Arrays.asList(ALSO_VISUALIZE_ITEMS_EMPTY_ARRAY));
private static final String [] TAXONOMY_SET_OPERATION_ARRAY = {"taxonomySetOperation.UNION", "taxonomySetOperation.INTERSECTION"};
private static final ArrayList<String> TAXONOMY_SET_OPERATION = new ArrayList<>(Arrays.asList(TAXONOMY_SET_OPERATION_ARRAY));
// TODO: pass observables for taxonomy based on header scan
// after header scan
private ObservableList<String> taxonomyCCBValues;
@ -320,6 +333,18 @@ public class OneWordAnalysisTab {
calculateForCB.getSelectionModel().select(0);
taxonomySetOperationCB.setDisable(true);
taxonomySetOperationCB.valueProperty().addListener((observable, oldValue, newValue) -> {
if(newValue == null){
newValue = I18N.getTranslatedValue(oldValue, TAXONOMY_SET_OPERATION);
taxonomySetOperationCB.getSelectionModel().select(newValue);
}
taxonomySetOperation = newValue;
logger.info("Taxonomy set operation:", taxonomySetOperation);
});
taxonomySetOperationCB.getSelectionModel().select(0);
// msd
msdTF.focusedProperty().addListener((observable, oldValue, newValue) -> {
if (!newValue) {
@ -419,6 +444,12 @@ public class OneWordAnalysisTab {
for (Taxonomy t : checkedItemsTaxonomy) {
taxonomyCCB.getCheckModel().check(t.toLongNameString());
}
if (taxonomyCCB.getCheckModel().getCheckedItems().size() > 0) {
taxonomySetOperationCB.setDisable(false);
} else {
taxonomySetOperationCB.getSelectionModel().select(0);
taxonomySetOperationCB.setDisable(true);
}
changing = true;
logger.info(String.format("Selected taxonomy: %s", StringUtils.join(checkedItems, ",")));
}
@ -629,6 +660,7 @@ public class OneWordAnalysisTab {
minimalOccurrencesL.textProperty().bind(I18N.createStringBinding("label.minimalOccurrences"));
minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
taxonomySetOperationL.textProperty().bind(I18N.createStringBinding("label.taxonomySetOperation"));
addTooltipToImage(calculateForI, I18N.createStringBinding("label.word.calculateForH"));
addTooltipToImage(alsoVisualizeI, I18N.createStringBinding("label.word.alsoVisualizeH"));
@ -639,6 +671,9 @@ public class OneWordAnalysisTab {
addTooltipToImage(taxonomyI, I18N.createStringBinding("label.word.taxonomyH"));
addTooltipToImage(minimalOccurrencesI, I18N.createStringBinding("label.word.minimalOccurrencesH"));
addTooltipToImage(minimalTaxonomyI, I18N.createStringBinding("label.word.minimalTaxonomyH"));
addTooltipToImage(taxonomySetOperationI, I18N.createStringBinding("label.letter.taxonomySetOperationH"));
taxonomySetOperationCB.itemsProperty().bind(I18N.createObjectBinding(TAXONOMY_SET_OPERATION));
}
/**
@ -692,6 +727,7 @@ public class OneWordAnalysisTab {
filter.setMinimalOccurrences(minimalOccurrences);
filter.setMinimalTaxonomy(minimalTaxonomy);
filter.setWriteMsdAtTheEnd(writeMsdAtTheEnd);
filter.setTaxonomySetOperation(taxonomySetOperation);
String message = Validation.validateForStringLevel(filter);
if (message == null) {

35
src/main/java/gui/StringAnalysisTabNew2.java
View File

@ -69,6 +69,9 @@ public class StringAnalysisTabNew2 {
@FXML
public Label minimalTaxonomyL;
@FXML
public Label taxonomySetOperationL;
@FXML
public Label skipValueL;
@ -108,6 +111,9 @@ public class StringAnalysisTabNew2 {
@FXML
public ImageView minimalTaxonomyI;
@FXML
public ImageView taxonomySetOperationI;
@FXML
public ImageView skipValueI;
@ -173,6 +179,10 @@ public class StringAnalysisTabNew2 {
private TextField minimalTaxonomyTF;
private Integer minimalTaxonomy;
@FXML
private ComboBox<String> taxonomySetOperationCB;
private String taxonomySetOperation;
@FXML
private Pane paneWords;
@ -250,6 +260,8 @@ public class StringAnalysisTabNew2 {
private static final String [] ALSO_VISUALIZE_ITEMS_EMPTY_ARRAY = {};
private static final ArrayList<String> ALSO_VISUALIZE_ITEMS_EMPTY = new ArrayList<>(Arrays.asList(ALSO_VISUALIZE_ITEMS_EMPTY_ARRAY));
private static final String [] TAXONOMY_SET_OPERATION_ARRAY = {"taxonomySetOperation.UNION", "taxonomySetOperation.INTERSECTION"};
private static final ArrayList<String> TAXONOMY_SET_OPERATION = new ArrayList<>(Arrays.asList(TAXONOMY_SET_OPERATION_ARRAY));
// TODO: pass observables for taxonomy based on header scan
// after header scan
@ -431,6 +443,18 @@ public class StringAnalysisTabNew2 {
calculateForCB.getSelectionModel().select(0);
taxonomySetOperationCB.setDisable(true);
taxonomySetOperationCB.valueProperty().addListener((observable, oldValue, newValue) -> {
if(newValue == null){
newValue = I18N.getTranslatedValue(oldValue, TAXONOMY_SET_OPERATION);
taxonomySetOperationCB.getSelectionModel().select(newValue);
}
taxonomySetOperation = newValue;
logger.info("Taxonomy set operation:", taxonomySetOperation);
});
taxonomySetOperationCB.getSelectionModel().select(0);
// collocabilityCCB
if (collocabilityListener != null){
collocabilityCCB.getCheckModel().getCheckedItems().removeListener(collocabilityListener);
@ -565,6 +589,12 @@ public class StringAnalysisTabNew2 {
for (Taxonomy t : checkedItemsTaxonomy) {
taxonomyCCB.getCheckModel().check(t.toLongNameString());
}
if (taxonomyCCB.getCheckModel().getCheckedItems().size() > 0) {
taxonomySetOperationCB.setDisable(false);
} else {
taxonomySetOperationCB.getSelectionModel().select(0);
taxonomySetOperationCB.setDisable(true);
}
changing = true;
logger.info(String.format("Selected taxonomy: %s", StringUtils.join(checkedItems, ",")));
}
@ -806,6 +836,7 @@ public class StringAnalysisTabNew2 {
taxonomyL.textProperty().bind(I18N.createStringBinding("label.taxonomy"));
minimalOccurrencesL.textProperty().bind(I18N.createStringBinding("label.minimalOccurrences"));
minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
taxonomySetOperationL.textProperty().bind(I18N.createStringBinding("label.taxonomySetOperation"));
solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
addTooltipToImage(calculateForI, I18N.createStringBinding("label.wordSet.calculateForH"));
@ -820,6 +851,9 @@ public class StringAnalysisTabNew2 {
addTooltipToImage(taxonomyI, I18N.createStringBinding("label.wordSet.taxonomyH"));
addTooltipToImage(minimalOccurrencesI, I18N.createStringBinding("label.wordSet.minimalOccurrencesH"));
addTooltipToImage(minimalTaxonomyI, I18N.createStringBinding("label.wordSet.minimalTaxonomyH"));
addTooltipToImage(taxonomySetOperationI, I18N.createStringBinding("label.letter.taxonomySetOperationH"));
taxonomySetOperationCB.itemsProperty().bind(I18N.createObjectBinding(TAXONOMY_SET_OPERATION));
}
/**
@ -879,6 +913,7 @@ public class StringAnalysisTabNew2 {
filter.setMinimalOccurrences(minimalOccurrences);
filter.setMinimalTaxonomy(minimalTaxonomy);
filter.setCollocability(collocability);
filter.setTaxonomySetOperation(taxonomySetOperation);
// if (ngramValue != null && ngramValue == 0) {
// filter.setStringLength(stringLength);

38
src/main/java/gui/WordLevelTab.java
View File

@ -85,6 +85,9 @@ public class WordLevelTab {
@FXML
public Label minimalTaxonomyL;
@FXML
public Label taxonomySetOperationL;
@FXML
public ImageView calculateForI;
@ -119,6 +122,9 @@ public class WordLevelTab {
@FXML
public ImageView minimalTaxonomyI;
@FXML
public ImageView taxonomySetOperationI;
@FXML
private TextField msdTF;
private ArrayList<Pattern> msd;
@ -168,6 +174,10 @@ public class WordLevelTab {
private TextField minimalTaxonomyTF;
private Integer minimalTaxonomy;
@FXML
private ComboBox<String> taxonomySetOperationCB;
private String taxonomySetOperation;
@FXML
private Button computeNgramsB;
@ -226,6 +236,10 @@ public class WordLevelTab {
// private static final ObservableList<String> alsoVisualizeItemsMsd = FXCollections.observableArrayList("besedna vrsta");
private static final String [] ALSO_VISUALIZE_ITEMS_MSD_ARRAY = {"calculateFor.WORD_TYPE"};
private static final ArrayList<String> ALSO_VISUALIZE_ITEMS_MSD = new ArrayList<>(Arrays.asList(ALSO_VISUALIZE_ITEMS_MSD_ARRAY));
private static final String [] TAXONOMY_SET_OPERATION_ARRAY = {"taxonomySetOperation.UNION", "taxonomySetOperation.INTERSECTION"};
private static final ArrayList<String> TAXONOMY_SET_OPERATION = new ArrayList<>(Arrays.asList(TAXONOMY_SET_OPERATION_ARRAY));
// private static final ObservableList<String> alsoVisualizeItemsEmpty = FXCollections.observableArrayList();
private static final String [] ALSO_VISUALIZE_ITEMS_EMPTY_ARRAY = {};
private static final ArrayList<String> ALSO_VISUALIZE_ITEMS_EMPTY = new ArrayList<>(Arrays.asList(ALSO_VISUALIZE_ITEMS_EMPTY_ARRAY));
@ -344,6 +358,19 @@ public class WordLevelTab {
calculateForCB.getSelectionModel().select(0);
taxonomySetOperationCB.setDisable(true);
taxonomySetOperationCB.valueProperty().addListener((observable, oldValue, newValue) -> {
if(newValue == null){
newValue = I18N.getTranslatedValue(oldValue, TAXONOMY_SET_OPERATION);
taxonomySetOperationCB.getSelectionModel().select(newValue);
}
taxonomySetOperation = newValue;
logger.info("Taxonomy set operation:", taxonomySetOperation);
});
taxonomySetOperationCB.getSelectionModel().select(0);
prefixLengthCB.getSelectionModel().select(0);
prefixLength = 0;
@ -547,6 +574,12 @@ public class WordLevelTab {
for (Taxonomy t : checkedItemsTaxonomy) {
taxonomyCCB.getCheckModel().check(t.toLongNameString());
}
if (taxonomyCCB.getCheckModel().getCheckedItems().size() > 0) {
taxonomySetOperationCB.setDisable(false);
} else {
taxonomySetOperationCB.getSelectionModel().select(0);
taxonomySetOperationCB.setDisable(true);
}
changing = true;
logger.info(String.format("Selected taxonomy: %s", StringUtils.join(checkedItems, ",")));
}
@ -766,6 +799,7 @@ public class WordLevelTab {
minimalOccurrencesL.textProperty().bind(I18N.createStringBinding("label.minimalOccurrences"));
minimalTaxonomyL.textProperty().bind(I18N.createStringBinding("label.minimalTaxonomy"));
solarFilters.textProperty().bind(I18N.createStringBinding("label.solarFilters"));
taxonomySetOperationL.textProperty().bind(I18N.createStringBinding("label.taxonomySetOperation"));
addTooltipToImage(calculateForI, I18N.createStringBinding("label.wordPart.calculateForH"));
addTooltipToImage(alsoVisualizeI, I18N.createStringBinding("label.wordPart.alsoVisualizeH"));
@ -780,6 +814,9 @@ public class WordLevelTab {
addTooltipToImage(taxonomyI, I18N.createStringBinding("label.wordPart.taxonomyH"));
addTooltipToImage(minimalOccurrencesI, I18N.createStringBinding("label.wordPart.minimalOccurrencesH"));
addTooltipToImage(minimalTaxonomyI, I18N.createStringBinding("label.wordPart.minimalTaxonomyH"));
addTooltipToImage(taxonomySetOperationI, I18N.createStringBinding("label.letter.taxonomySetOperationH"));
taxonomySetOperationCB.itemsProperty().bind(I18N.createObjectBinding(TAXONOMY_SET_OPERATION));
}
/**
@ -840,6 +877,7 @@ public class WordLevelTab {
filter.setSuffixLength(suffixLength);
filter.setPrefixList(prefixList);
filter.setSuffixList(suffixList);
filter.setTaxonomySetOperation(taxonomySetOperation);
// filter.setWriteMsdAtTheEnd(writeMsdAtTheEnd);
String message = Validation.validateForStringLevel(filter);

35
src/main/resources/gui/CharacterAnalysisTab.fxml
View File

@ -5,17 +5,12 @@
<?import javafx.scene.control.Hyperlink?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ProgressBar?>
<?import javafx.scene.control.RadioButton?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.control.ToggleGroup?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import org.controlsfx.control.CheckComboBox?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.collections.FXCollections?>
<?import java.lang.String?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.control.TextArea?>
@ -70,28 +65,34 @@
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="taxonomyL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Taksonomija"/>
<CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="140.0" prefHeight="25.0" prefWidth="140.0"/>
<Label fx:id="taxonomyLH" layoutX="10.0" layoutY="170.0" prefHeight="10.0" styleClass="help"/>
<ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="taxonomySetOperationL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Filtriraj taksonomijo po"/>
<ComboBox fx:id="taxonomySetOperationCB" layoutX="225.0" layoutY="140.0" minWidth="140.0" prefWidth="140.0"
visibleRowCount="5"/>
<ImageView fx:id="taxonomySetOperationI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Min. št. pojavitev" />
<TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="180.0" prefWidth="140.0" />
<ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="taxonomyL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Taksonomija"/>
<CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="180.0" prefHeight="25.0" prefWidth="140.0"/>
<ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. taksonomij" />
<TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
<ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. pojavitev" />
<TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
<ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="260.0" prefHeight="25.0" text="Min. št. taksonomij" />
<TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="260.0" prefWidth="140.0" />
<ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="267.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="solarFilters" layoutX="10.0" layoutY="280.0" text="Izbrani filtri:" />
<TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="320.0" prefHeight="80.0" maxHeight="80.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
<Label fx:id="solarFilters" layoutX="10.0" layoutY="320.0" text="Izbrani filtri:" />
<TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="360.0" prefHeight="115.0" maxHeight="115.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
</Pane>
<Hyperlink fx:id="helpH" alignment="TOP_LEFT" layoutX="710.0" layoutY="16.0" text="Pomoč" />

30
src/main/resources/gui/OneWordAnalysisTab.fxml
View File

@ -68,28 +68,34 @@
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="taxonomyL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Taksonomija"/>
<CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="140.0" prefHeight="25.0" prefWidth="140.0"/>
<Label fx:id="taxonomyLH" layoutX="10.0" layoutY="170.0" prefHeight="10.0" styleClass="help"/>
<ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="taxonomySetOperationL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Filtriraj taksonomijo po"/>
<ComboBox fx:id="taxonomySetOperationCB" layoutX="225.0" layoutY="140.0" minWidth="140.0" prefWidth="140.0"
visibleRowCount="5"/>
<ImageView fx:id="taxonomySetOperationI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Min. št. pojavitev" />
<TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="180.0" prefWidth="140.0" />
<ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="taxonomyL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Taksonomija"/>
<CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="180.0" prefHeight="25.0" prefWidth="140.0"/>
<ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. taksonomij" />
<TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
<ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. pojavitev" />
<TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
<ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="260.0" prefHeight="25.0" text="Min. št. taksonomij" />
<TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="260.0" prefWidth="140.0" />
<ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="267.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="solarFilters" layoutX="10.0" layoutY="280.0" text="Izbrani filtri:" />
<TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="320.0" prefHeight="80.0" maxHeight="80.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
<Label fx:id="solarFilters" layoutX="10.0" layoutY="320.0" text="Izbrani filtri:" />
<TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="360.0" prefHeight="115.0" maxHeight="115.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
</Pane>
<!--<Pane layoutX="400.0" prefHeight="480.0" prefWidth="380.0">-->

30
src/main/resources/gui/StringAnalysisTabNew2.fxml
View File

@ -116,28 +116,34 @@
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="taxonomyL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Taksonomija"/>
<CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="140.0" prefHeight="25.0" prefWidth="140.0"/>
<Label fx:id="taxonomyLH" layoutX="10.0" layoutY="170.0" prefHeight="10.0" styleClass="help"/>
<ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="taxonomySetOperationL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Filtriraj taksonomijo po"/>
<ComboBox fx:id="taxonomySetOperationCB" layoutX="225.0" layoutY="140.0" minWidth="140.0" prefWidth="140.0"
visibleRowCount="5"/>
<ImageView fx:id="taxonomySetOperationI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Min. št. pojavitev" />
<TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="180.0" prefWidth="140.0" />
<ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="taxonomyL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Taksonomija"/>
<CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="180.0" prefHeight="25.0" prefWidth="140.0"/>
<ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. taksonomij" />
<TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
<ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. pojavitev" />
<TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
<ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="260.0" prefHeight="25.0" text="Min. št. taksonomij" />
<TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="260.0" prefWidth="140.0" />
<ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="267.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="solarFilters" layoutX="10.0" layoutY="280.0" text="Izbrani filtri:" />
<TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="320.0" prefHeight="80.0" maxHeight="80.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
<Label fx:id="solarFilters" layoutX="10.0" layoutY="320.0" text="Izbrani filtri:" />
<TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="360.0" prefHeight="115.0" maxHeight="115.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
</Pane>
<Hyperlink fx:id="helpH" alignment="TOP_LEFT" layoutX="710.0" layoutY="16.0" text="Pomoč" />

30
src/main/resources/gui/WordLevelTab.fxml
View File

@ -119,28 +119,34 @@
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="taxonomyL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Taksonomija"/>
<CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="140.0" prefHeight="25.0" prefWidth="140.0"/>
<Label fx:id="taxonomyLH" layoutX="10.0" layoutY="170.0" prefHeight="10.0" styleClass="help"/>
<ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="taxonomySetOperationL" layoutX="10.0" layoutY="140.0" prefHeight="25.0" text="Filtriraj taksonomijo po"/>
<ComboBox fx:id="taxonomySetOperationCB" layoutX="225.0" layoutY="140.0" minWidth="140.0" prefWidth="140.0"
visibleRowCount="5"/>
<ImageView fx:id="taxonomySetOperationI" layoutX="370.0" layoutY="147.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Min. št. pojavitev" />
<TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="180.0" prefWidth="140.0" />
<ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="taxonomyL" layoutX="10.0" layoutY="180.0" prefHeight="25.0" text="Taksonomija"/>
<CheckComboBox fx:id="taxonomyCCB" layoutX="225.0" layoutY="180.0" prefHeight="25.0" prefWidth="140.0"/>
<ImageView fx:id="taxonomyI" layoutX="370.0" layoutY="187.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. taksonomij" />
<TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
<ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
<Label fx:id="minimalOccurrencesL" layoutX="10.0" layoutY="220.0" prefHeight="25.0" text="Min. št. pojavitev" />
<TextField fx:id="minimalOccurrencesTF" layoutX="225.0" layoutY="220.0" prefWidth="140.0" />
<ImageView fx:id="minimalOccurrencesI" layoutX="370.0" layoutY="227.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="minimalTaxonomyL" layoutX="10.0" layoutY="260.0" prefHeight="25.0" text="Min. št. taksonomij" />
<TextField fx:id="minimalTaxonomyTF" layoutX="225.0" layoutY="260.0" prefWidth="140.0" />
<ImageView fx:id="minimalTaxonomyI" layoutX="370.0" layoutY="267.5" pickOnBounds="true" preserveRatio="true">
<Image url="questionmark.png" backgroundLoading="true"/>
</ImageView>
<Label fx:id="solarFilters" layoutX="10.0" layoutY="280.0" text="Izbrani filtri:" />
<TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="320.0" prefHeight="80.0" maxHeight="80.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
<Label fx:id="solarFilters" layoutX="10.0" layoutY="320.0" text="Izbrani filtri:" />
<TextArea fx:id="selectedFiltersTextArea" layoutX="10.0" layoutY="360.0" prefHeight="115.0" maxHeight="115.0" prefWidth="360.0" text=" " wrapText="true" editable="false"/>
</Pane>
<Hyperlink fx:id="helpH" alignment="TOP_LEFT" layoutX="710.0" layoutY="16.0" text="Pomoč" />

7
src/main/resources/message_en.properties
View File

@ -39,6 +39,7 @@ label.msd=MSD
label.taxonomy=Taxonomy
label.minimalOccurrences=Min. n. occurrences
label.minimalTaxonomy=Min. n. taxonomies
label.taxonomySetOperation=Filtriraj taksonomijo po
label.solarFilters=Selected filters:
string.lemma=lemma
string.word=word
@ -50,6 +51,7 @@ label.letter.msdH=Črkovni nizi bodo prešteti samo v besedah z določeno oznako
label.letter.taxonomyH=Črkovni nizi bodo prešteti samo v izbranih vrstah besedil.
label.letter.minimalOccurrencesH=Črkovni nizi z manj pojavitvami ne bodo vključeni v izpis.
label.letter.minimalTaxonomyH=Črkovni nizi, prisotni v manj taksonomskih vejah, ne bodo vključeni v izpis.
label.letter.taxonomySetOperationH=Izpisuj iz besedil, ki ustrezajo vsaj eni od izbranih vej (unija) ali vsem izbranim vejam (presek)
# word part tab
label.alsoVisualize=Also filter
@ -114,6 +116,10 @@ label.ngramValue=N-gram level
label.notePunctuations=Note punctuations
label.collocability=Collocability
# taxonomy set operations
taxonomySetOperation.UNION=union
taxonomySetOperation.INTERSECTION=intersection
# filtersSolar
filter.solarRegijaL=Region
filter.solarPredmetL=Subject
@ -207,6 +213,7 @@ exportHeader.minTaxonomies=Min. n. taxonomies:
exportHeader.additionalFilters=Additional filters:
exportHeader.yes=yes
exportHeader.no=no
exportHeader.taxonomySetOperation=Filter taxonomy by:
# export table header translations
exportTable.skippedWords=Skipped words

8
src/main/resources/message_sl.properties
View File

@ -39,6 +39,7 @@ label.msd=Oblikoskladenjska oznaka
label.taxonomy=Filtriranje po taksonomiji
label.minimalOccurrences=Min. št. pojavitev
label.minimalTaxonomy=Min. št. taksonomskih vej
label.taxonomySetOperation=Filtriraj taksonomijo po
label.solarFilters=Izbrani filtri:
string.lemma=lema
string.word=oblika
@ -50,6 +51,7 @@ label.letter.msdH=Črkovni nizi bodo prešteti samo v besedah z določeno oznako
label.letter.taxonomyH=Črkovni nizi bodo prešteti samo v izbranih vrstah besedil.
label.letter.minimalOccurrencesH=Črkovni nizi z manj pojavitvami ne bodo vključeni v izpis.
label.letter.minimalTaxonomyH=Črkovni nizi, prisotni v manj taksonomskih vejah, ne bodo vključeni v izpis.
label.letter.taxonomySetOperationH=Izpisuj iz besedil, ki ustrezajo vsaj eni od izbranih vej (unija) ali vsem izbranim vejam (presek)
# word part tab
label.alsoVisualize=Upoštevaj tudi
@ -107,6 +109,10 @@ calculateFor.WORD_TYPE=besedne vrste
calculateFor.DIST_WORDS=oblike
calculateFor.DIST_LEMMAS=leme
# taxonomy set operations
taxonomySetOperation.UNION=uniji
taxonomySetOperation.INTERSECTION=preseku
# n-grams
label.skipValue=Preskok besed
label.slowSpeedWarning=* IZBIRA PREDHODNEGA FILTRA LAHKO MOČNO UPOČASNI DELOVANJE
@ -128,7 +134,6 @@ filter.solarLeto=leto
filter.solarSola=sola
filter.solarVrstaBesedila=tip
# messages
message.WARNING_CORPUS_NOT_FOUND=V izbranem direktoriju ni ustreznih korpusnih datotek.
message.WARNING_RESULTS_DIR_NOT_VALID=Za dostop do izbranega direktorija nimate potrebnih pravic.
@ -208,6 +213,7 @@ exportHeader.minTaxonomies=Min. št. taksonomskih vej:
exportHeader.additionalFilters=Dodatni filtri:
exportHeader.yes=da
exportHeader.no=ne
exportHeader.taxonomySetOperation=Filtriranje taksonomije po:
# export table header translations
exportTable.skippedWords=Izpuščene besede