From: <ku...@us...> - 2009-02-06 10:22:02
|
Revision: 1586 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1586&view=rev Author: kurzum Date: 2009-02-06 10:21:58 +0000 (Fri, 06 Feb 2009) Log Message: ----------- configurator adaption Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/ELLearningAlgorithmConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java trunk/src/dl-learner/org/dllearner/utilities/Files.java Property Changed: ---------------- trunk/src/dl-learner/org/dllearner/utilities/ Modified: trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -30,7 +30,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class BruteForceLearnerConfigurator implements Configurator { +public class BruteForceLearnerConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -31,7 +31,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class DBpediaNavigationSuggestorConfigurator implements Configurator { +public class DBpediaNavigationSuggestorConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -29,7 +29,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class DIGReasonerConfigurator implements Configurator { +public class DIGReasonerConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ELLearningAlgorithmConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/ELLearningAlgorithmConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/ELLearningAlgorithmConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -30,7 +30,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class ELLearningAlgorithmConfigurator implements Configurator { +public class ELLearningAlgorithmConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -31,7 +31,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class ExampleBasedROLComponentConfigurator implements Configurator { +public class ExampleBasedROLComponentConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -29,7 +29,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class FastInstanceCheckerConfigurator implements Configurator { +public class FastInstanceCheckerConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -29,7 +29,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class FastRetrievalReasonerConfigurator implements Configurator { +public class FastRetrievalReasonerConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -30,7 +30,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class GPConfigurator implements Configurator { +public class GPConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -28,7 +28,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class KBFileConfigurator implements Configurator { +public class KBFileConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -27,7 +27,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class OWLAPIOntologyConfigurator implements Configurator { +public class OWLAPIOntologyConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -29,7 +29,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class OWLAPIReasonerConfigurator implements Configurator { +public class OWLAPIReasonerConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -28,7 +28,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class OWLFileConfigurator implements Configurator { +public class OWLFileConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -29,7 +29,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class PosNegDefinitionLPConfigurator implements Configurator { +public class PosNegDefinitionLPConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -29,7 +29,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class PosNegDefinitionLPStrictConfigurator implements Configurator { +public class PosNegDefinitionLPStrictConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -29,7 +29,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class PosNegInclusionLPConfigurator implements Configurator { +public class PosNegInclusionLPConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -29,7 +29,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class PosOnlyDefinitionLPConfigurator implements Configurator { +public class PosOnlyDefinitionLPConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -29,7 +29,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class PosOnlyInclusionLPConfigurator implements Configurator { +public class PosOnlyInclusionLPConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -26,12 +26,13 @@ import org.dllearner.core.LearningProblem; import org.dllearner.core.LearningProblemUnsupportedException; import org.dllearner.core.ReasonerComponent; +import org.dllearner.utilities.Files; /** * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class ROLearnerConfigurator implements Configurator { +public class ROLearnerConfigurator extends Files implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -30,7 +30,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class RandomGuesserConfigurator implements Configurator { +public class RandomGuesserConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -30,7 +30,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class SimpleSuggestionLearningAlgorithmConfigurator implements Configurator { +public class SimpleSuggestionLearningAlgorithmConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -31,7 +31,7 @@ * automatically generated, do not edit manually. * run org.dllearner.scripts.ConfigJavaGenerator to update **/ -public class SparqlKnowledgeSourceConfigurator implements Configurator { +public class SparqlKnowledgeSourceConfigurator implements Configurator { private boolean reinitNecessary = false; @SuppressWarnings("unused") Modified: trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -21,6 +21,7 @@ import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -37,6 +38,7 @@ import org.dllearner.core.LearningProblem; import org.dllearner.core.LearningProblemUnsupportedException; import org.dllearner.core.ReasonerComponent; +import org.dllearner.core.configurators.ROLearnerConfigurator; import org.dllearner.core.options.ConfigOption; import org.dllearner.utilities.Files; @@ -50,6 +52,22 @@ * */ public final class ConfigJavaGenerator { + + private static final SortedSet<String> DONOTDELETE = + new TreeSet<String>(Arrays.asList(new String[]{ + ".svn", + ".svn", + })); + + // currently it targets the configurators for + private static final SortedSet<String> EXTENDSREFINEMENTOPERATOR = + new TreeSet<String>(Arrays.asList(new String[]{ + ROLearnerConfigurator.class.getSimpleName(), + ROLearnerConfigurator.class.getSimpleName(), + })); + + @SuppressWarnings("unchecked") + private static final Class EXTENDSREFINEMENTOPERATORCLASS = Files.class; private static final boolean INCLUDE_UNUSED = false; @@ -89,6 +107,10 @@ private String className; private String componentType; + + private String extendS = ""; + + //private String implementS = ""; private List<String> body = new ArrayList<String>(); @@ -118,7 +140,21 @@ Files.backupDirectory(TARGET_DIR); System.out.println("previous classes were backupped to tmp/+System.currentTimeMillis()"); - Files.deleteDir(TARGET_DIR); + String[] files = Files.listDir(TARGET_DIR); + + for (String file : files){ + //System.out.println(DONOTDELETE); + + if(DONOTDELETE.contains(file)){ + continue; + } + //System.out.println(file); + String todelete = TARGET_DIR + File.separator + file; + Files.deleteFile(todelete); + + } + //System.exit(0); + //Files.deleteDir(TARGET_DIR); ComponentManager cm = ComponentManager.getInstance(); COMPONENT_FACTORY_IMPORTS.add(KnowledgeSource.class.getCanonicalName()); @@ -200,10 +236,12 @@ System.out.println("Done"); } + + private ConfigJavaGenerator(Class<? extends Component> component, String componentType) { - className = component.getSimpleName(); + this.className = component.getSimpleName(); this.component = component; this.componentType = componentType; imports.add(component.getCanonicalName()); @@ -211,9 +249,14 @@ // imports.add(Configurator.class.getCanonicalName()); // imports.add(ConfigEntry.class.getCanonicalName()); - vars - .add("private " + className + " " + deCapitalize(className) + vars.add("private " + className + " " + deCapitalize(className) + ";\n"); + + if(EXTENDSREFINEMENTOPERATOR.contains(this.className+CONFIGURATOR)){ + this.extendS = EXTENDSREFINEMENTOPERATORCLASS.getSimpleName(); + this.imports.add(EXTENDSREFINEMENTOPERATORCLASS.getCanonicalName()); + } + } @@ -265,7 +308,7 @@ TARGET_PACKAGE, importtmp, className + CONFIGURATOR, - "", + extendS, bodytmp , "", CONFIGURATOR); @@ -494,8 +537,8 @@ ret += fillJavaDocComment(CLASS_COMMENT); ret += (INCLUDE_UNUSED) ? UNUSED : ""; ret += "public "+classModifier+" class " + className + " " - + ((extendS.length() > 0) ? "extends " + extendS : "") - + ((implementS.length() > 0) ? "implements " + implementS : "") + + ((extendS.length() > 0) ? " extends " + extendS : "") + + ((implementS.length() > 0) ? " implements " + implementS : "") + " {\n\n"; ret += body + "\n"; ret += "}\n"; Property changes on: trunk/src/dl-learner/org/dllearner/utilities ___________________________________________________________________ Added: svn:ignore + oaiWikipediaReader Modified: trunk/src/dl-learner/org/dllearner/utilities/Files.java =================================================================== --- trunk/src/dl-learner/org/dllearner/utilities/Files.java 2009-02-04 12:38:28 UTC (rev 1585) +++ trunk/src/dl-learner/org/dllearner/utilities/Files.java 2009-02-06 10:21:58 UTC (rev 1586) @@ -188,6 +188,11 @@ } } + + public static void deleteFile(String file) { + deleteFile(new File(file)); + } + public static void deleteFile(File file) { try{ @@ -234,6 +239,27 @@ } /** + * lists all files in a directory + * + * + * @param dir without a separator e.g. tmp/dir + * @return a string array with filenames + */ + public static String[] listDir(String dir) { + + File f = new File(dir); + + if(debug){ + System.out.println(dir); + System.exit(0); + } + + return f.list(); + + + } + + /** * copies all files in dir to "tmp/"+System.currentTimeMillis() * @param dir the dir to be backupped */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |