From: <hee...@us...> - 2009-10-08 11:04:27
|
Revision: 1884 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1884&view=rev Author: heeroyuy Date: 2009-10-08 11:04:20 +0000 (Thu, 08 Oct 2009) Log Message: ----------- -finished adding new options in protege plugin Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 09:48:07 UTC (rev 1883) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 11:04:20 UTC (rev 1884) @@ -145,7 +145,7 @@ * ItemEvent */ public void itemStateChanged(ItemEvent i) { - + } /** Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-08 09:48:07 UTC (rev 1883) +++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-08 11:04:20 UTC (rev 1884) @@ -300,7 +300,15 @@ // TODO Auto-generated catch block e.printStackTrace(); } - cm.applyConfigEntry(la, "useNegation", false); + cm.applyConfigEntry(la, "useAllConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getAllBox().isSelected()); + cm.applyConfigEntry(la, "useExistsConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getSomeBox().isSelected()); + cm.applyConfigEntry(la, "useHasValueConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getValueBox().isSelected()); + cm.applyConfigEntry(la, "useNegation", view.getPosAndNegSelectPanel().getOptionPanel().getNotBox().isSelected()); + cm.applyConfigEntry(la, "useCardinalityRestrictions", view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox().isSelected()); + if(view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox().isSelected()) { + cm.applyConfigEntry(la, "cardinalityLimit", view.getPosAndNegSelectPanel().getOptionPanel().getCountMoreBox().getSelectedItem()); + } + cm.applyConfigEntry(la, "noisePercentage", view.getPosAndNegSelectPanel().getOptionPanel().getMinAccuracy()); cm.applyConfigEntry(la, "maxExecutionTimeInSeconds", view .getPosAndNegSelectPanel().getOptionPanel() Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-08 09:48:07 UTC (rev 1883) +++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-08 11:04:20 UTC (rev 1884) @@ -53,10 +53,8 @@ private JCheckBox someBox; private JCheckBox notBox; private JCheckBox valueBox; - private JCheckBox lessBox; private JCheckBox moreBox; - private JComboBox countLessBox; private JComboBox countMoreBox; private JPanel profilePanel; @@ -83,7 +81,7 @@ radioBoxPanel = new JPanel(); radioBoxPanel.setLayout(new GridLayout(1, 3)); checkBoxPanel = new JPanel(); - checkBoxPanel.setLayout(new GridLayout(1, 8)); + checkBoxPanel.setLayout(new GridLayout(1, 6)); minAccuracyLabel = new JLabel("noise in %: "); maxExecutionTimeLabel = new JLabel("maximum execution time: "); @@ -123,46 +121,27 @@ notBox.addItemListener(optionHandler); valueBox = new JCheckBox("value", true); valueBox.addItemListener(optionHandler); - lessBox = new JCheckBox("<=x with max.:", true); - lessBox.addItemListener(optionHandler); - moreBox = new JCheckBox(">=x with max.:", true); + moreBox = new JCheckBox("<=x, >=x with max.:", true); moreBox.addItemListener(optionHandler); - countLessBox = new JComboBox(); - countLessBox.addItem("1"); - - countLessBox.addItem("2"); - countLessBox.addItem("3"); - countLessBox.addItem("4"); - countLessBox.addItem("5"); - countLessBox.addItem("6"); - countLessBox.addItem("7"); - countLessBox.addItem("8"); - countLessBox.addItem("9"); - countLessBox.addItem("10"); - countLessBox.setSelectedItem("3"); - countLessBox.setEditable(false); - countMoreBox = new JComboBox(); - countMoreBox.addItem("1"); - countMoreBox.addItem("2"); - countMoreBox.addItem("3"); - countMoreBox.addItem("4"); - countMoreBox.addItem("5"); - countMoreBox.addItem("6"); - countMoreBox.addItem("7"); - countMoreBox.addItem("8"); - countMoreBox.addItem("9"); - countMoreBox.addItem("10"); - countMoreBox.setSelectedItem("3"); + countMoreBox.addItem(1); + countMoreBox.addItem(2); + countMoreBox.addItem(3); + countMoreBox.addItem(4); + countMoreBox.addItem(5); + countMoreBox.addItem(6); + countMoreBox.addItem(7); + countMoreBox.addItem(8); + countMoreBox.addItem(9); + countMoreBox.addItem(10); + countMoreBox.setSelectedItem(5); countMoreBox.setEditable(false); checkBoxPanel.add(allBox); checkBoxPanel.add(someBox); checkBoxPanel.add(notBox); checkBoxPanel.add(valueBox); - checkBoxPanel.add(lessBox); - checkBoxPanel.add(countLessBox); checkBoxPanel.add(moreBox); checkBoxPanel.add(countMoreBox); @@ -236,17 +215,10 @@ return valueBox; } - public JCheckBox getLessBox() { - return lessBox; - } - public JPanel getProfilePanel() { return profilePanel; } - public JComboBox getCountLessBox() { - return countLessBox; - } public JComboBox getCountMoreBox() { return countMoreBox; Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-08 09:48:07 UTC (rev 1883) +++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-08 11:04:20 UTC (rev 1884) @@ -7,6 +7,7 @@ private static final String OWL_RADIO_STRING = "OWL 2"; private static final String EL_RADIO_STRING = "EL Profile"; + private static final String VALUE_STRING = "<=x, >=x with max.:"; private OptionPanel option; @@ -31,6 +32,12 @@ this.setToOWLProfile(); } + } else if(e.toString().contains(VALUE_STRING)) { + if(option.getMoreBox().isSelected()) { + option.getCountMoreBox().setEnabled(true); + } else { + option.getCountMoreBox().setEnabled(false); + } } } @@ -41,8 +48,6 @@ option.getSomeBox().setSelected(true); option.getNotBox().setSelected(true); option.getValueBox().setSelected(true); - option.getLessBox().setSelected(true); - option.getCountLessBox().setEnabled(true); option.getMoreBox().setSelected(true); option.getCountMoreBox().setEnabled(true); } @@ -54,8 +59,6 @@ option.getSomeBox().setSelected(true); option.getNotBox().setSelected(false); option.getValueBox().setSelected(false); - option.getLessBox().setSelected(false); - option.getCountLessBox().setEnabled(false); option.getMoreBox().setSelected(false); option.getCountMoreBox().setEnabled(false); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |