dl-learner-svn Mailing List for DL-Learner (Page 163)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 227
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=227&view=rev
Author:   jenslehmann
Date:     2007-10-16 02:32:08 -0700 (Tue, 16 Oct 2007)

Log Message:
-----------
refactored web service classes, added some documentation, adjusted build script

Modified Paths:
--------------
    trunk/build.xml
    trunk/src/dl-learner/org/dllearner/server/DLLearnerWSStart.java
    trunk/src/dl-learner/org/dllearner/server/package.html

Added Paths:
-----------
    trunk/src/dl-learner/org/dllearner/server/ClientState.java
    trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
    trunk/src/dl-learner/org/dllearner/server/jaxws/package.html

Removed Paths:
-------------
    trunk/src/dl-learner/org/dllearner/server/DLLearnerWSNew.java
    trunk/src/dl-learner/org/dllearner/server/State.java

Modified: trunk/build.xml
===================================================================

--- trunk/build.xml	2007-10-16 09:27:26 UTC (rev 226)
+++ trunk/build.xml	2007-10-16 09:32:08 UTC (rev 227)
@@ -164,8 +164,7 @@
 	    <arg value="-verbose"/>
 	  	<arg value="-cp"/>
 		<arg value="${wsgenpath}"/>
-		<!--<arg value=".;../../classes;../../library/dig1.1-xmlbeans.jar;../../library/kaon2.jar;../../library/xbean.jar;../../library/owlapi/;../../library/owlapi/antlr-runtime-3.0.jar;../../library/owlapi/commons-lang-2.2.jar;../../library/owlapi/owlapi-api.jar;../../library/owlapi/owlapi-apibinding.jar;../../library/owlapi/owlapi-change.jar;../../library/owlapi/owlapi-debugging.jar;../../library/owlapi/owlapi-dig1_1.jar;../../library/owlapi/owlapi-functionalparser.jar;../../library/owlapi/owlapi-functionalrenderer.jar;../../library/owlapi/owlapi-impl.jar;../../library/owlapi/owlapi-krssparser.jar;../../library/owlapi/owlapi-mansyntaxparser.jar;../../library/owlapi/owlapi-mansyntaxrenderer.jar;../../library/owlapi/owlapi-metrics.jar;../../library/owlapi/owlapi-oboparser.jar;../../library/owlapi/owlapi-owlxmlparser.jar;../../library/owlapi/owlapi-owlxmlrenderer.jar;../../library/owlapi/owlapi-rdfapi.jar;../../library/owlapi/owlapi-rdfxmlparser.jar;../../library/owlapi/owlapi-rdfxmlrenderer.jar;../../library/owlapi/owlapi-util.jar"/>-->
-	    <arg value="org.dllearner.server.DLLearnerWSNew"/>  
+		<arg value="org.dllearner.server.DLLearnerWS"/>  
 	  </exec>
 	</target>
 	

Copied: trunk/src/dl-learner/org/dllearner/server/ClientState.java (from rev 218, trunk/src/dl-learner/org/dllearner/server/State.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/ClientState.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/server/ClientState.java	2007-10-16 09:32:08 UTC (rev 227)
@@ -0,0 +1,209 @@
+/**
+ * Copyright (C) 2007, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.server;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
+import org.dllearner.core.Component;
+import org.dllearner.core.KnowledgeSource;
+import org.dllearner.core.LearningAlgorithm;
+import org.dllearner.core.LearningProblem;
+import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.ReasoningService;
+import org.dllearner.kb.OWLFile;
+import org.dllearner.kb.SparqlEndpoint;
+
+/**
+ * Stores the state of a DL-Learner client session.
+ * 
+ * @author Jens Lehmann
+ *
+ */
+public class ClientState {
+
+	// stores the mapping between component IDs and component
+	// (note that this allows us to keep all references to components even
+	// if they are note used anymore e.g. a deleted knowledge source)
+	private Map<Integer,Component> componentIDs = new HashMap<Integer,Component>(); 
+	
+	private Set<KnowledgeSource> knowledgeSources = new HashSet<KnowledgeSource>();
+	
+	private LearningProblem learningProblem;
+	
+	private ReasonerComponent reasonerComponent;
+	private ReasoningService reasoningService;
+	
+	private LearningAlgorithm learningAlgorithm;
+
+	private Random rand=new Random();
+	
+	private boolean isAlgorithmRunning = false;
+	
+	private int generateComponentID(Component component) {
+		int id;
+		do {
+			id = rand.nextInt();
+		} while(componentIDs.keySet().contains(id));
+		componentIDs.put(id, component);
+		return id;		
+	}
+	
+	/**
+	 * @return the isAlgorithmRunning
+	 */
+	public boolean isAlgorithmRunning() {
+		return isAlgorithmRunning;
+	}
+
+	/**
+	 * @param isAlgorithmRunning the isAlgorithmRunning to set
+	 */
+	public void setAlgorithmRunning(boolean isAlgorithmRunning) {
+		this.isAlgorithmRunning = isAlgorithmRunning;
+	}
+	
+//	public Component getComponent(Class<? extends Component> componentClass) throws UnknownComponentException {
+//		if(learningProblem.getClass().equals(componentClass))
+//			return learningProblem;
+//		else if(learningAlgorithm.getClass().equals(componentClass))
+//			return learningAlgorithm;
+//		else if(reasonerComponent.getClass().equals(componentClass))
+//			return reasonerComponent;
+//		else if(KnowledgeSource.class.isAssignableFrom(componentClass)) {
+//			
+//			
+//			for(KnowledgeSource ks : knowledgeSources) {
+//				if(ks.getClass().equals(componentClass))
+//					return ks;
+//			}
+//			throw new UnknownComponentException(componentClass.getName());
+//		} else
+//			throw new UnknownComponentException(componentClass.getName());
+//	}
+
+	/**
+	 * Removes a knowledge source with the given URL (independant of its type).
+	 * @param url URL of the OWL file or SPARQL Endpoint.
+	 * @return True if a knowledge source was deleted, false otherwise.
+	 */
+	public boolean removeKnowledgeSource(String url) {
+		Iterator<KnowledgeSource> it = knowledgeSources.iterator(); 
+		while(it.hasNext()) {
+			KnowledgeSource source = it.next();
+			if((source instanceof OWLFile && ((OWLFile)source).getURL().toString().equals(url))
+				|| (source instanceof SparqlEndpoint && ((SparqlEndpoint)source).getURL().toString().equals(url)) ) {
+				it.remove();
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return the learningProblem
+	 */
+	public LearningProblem getLearningProblem() {
+		return learningProblem;
+	}
+
+	/**
+	 * @param learningProblem the learningProblem to set
+	 */
+	public int setLearningProblem(LearningProblem learningProblem) {
+		this.learningProblem = learningProblem;
+		return generateComponentID(learningProblem);
+	}
+
+	/**
+	 * @return the reasonerComponent
+	 */
+	public ReasonerComponent getReasonerComponent() {
+		return reasonerComponent;
+	}
+
+	/**
+	 * Sets the reasoner component and creates the corresponding
+	 * <code>ReasoningService</code> instance.
+	 * 
+	 * @param reasonerComponent the reasonerComponent to set
+	 */
+	public int setReasonerComponent(ReasonerComponent reasonerComponent) {
+		this.reasonerComponent = reasonerComponent;
+		reasoningService = new ReasoningService(reasonerComponent);
+		return generateComponentID(reasonerComponent);
+	}
+
+	/**
+	 * @return the learningAlgorithm
+	 */
+	public LearningAlgorithm getLearningAlgorithm() {
+		return learningAlgorithm;
+	}
+
+	/**
+	 * @param learningAlgorithm the learningAlgorithm to set
+	 */
+	public int setLearningAlgorithm(LearningAlgorithm learningAlgorithm) {
+		this.learningAlgorithm = learningAlgorithm;
+		return generateComponentID(learningAlgorithm);
+	}
+
+	/**
+	 * @return the reasoningService
+	 */
+	public ReasoningService getReasoningService() {
+		return reasoningService;
+	}
+
+	/**
+	 * @param key
+	 * @return
+	 * @see java.util.Map#get(java.lang.Object)
+	 */
+	public Component getComponent(int id) {
+		return componentIDs.get(id);
+	}
+
+	/**
+	 * @param e
+	 * @return
+	 */
+	public int addKnowledgeSource(KnowledgeSource ks) {
+		knowledgeSources.add(ks);
+		return generateComponentID(ks);
+		
+	}
+
+	public boolean removeKnowledgeSource(int componentID) {
+		return knowledgeSources.remove(componentIDs.get(componentID));
+	}
+	
+	/**
+	 * @return the knowledgeSources
+	 */
+	public Set<KnowledgeSource> getKnowledgeSources() {
+		return knowledgeSources;
+	}
+}

Copied: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java (from rev 225, trunk/src/dl-learner/org/dllearner/server/DLLearnerWSNew.java)
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2007-10-16 09:32:08 UTC (rev 227)
@@ -0,0 +1,350 @@
+/**
+ * Copyright (C) 2007, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ * 
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.server;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.dllearner.algorithms.refinement.ROLearner;
+import org.dllearner.core.Component;
+import org.dllearner.core.ComponentManager;
+import org.dllearner.core.KnowledgeSource;
+import org.dllearner.core.LearningAlgorithm;
+import org.dllearner.core.LearningProblem;
+import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.dl.AtomicConcept;
+import org.dllearner.core.dl.AtomicRole;
+import org.dllearner.core.dl.Concept;
+import org.dllearner.core.dl.Individual;
+import org.dllearner.kb.OWLFile;
+import org.dllearner.kb.SparqlEndpoint;
+import org.dllearner.learningproblems.PosNegDefinitionLP;
+import org.dllearner.learningproblems.PosNegInclusionLP;
+import org.dllearner.parser.KBParser;
+import org.dllearner.parser.ParseException;
+import org.dllearner.reasoning.DIGReasoner;
+import org.dllearner.utilities.Datastructures;
+
+/**
+ * DL-Learner web service interface.
+ * 
+ * @author Jens Lehmann
+ * @author Sebastian Hellmann
+ *
+ */
+@WebService(name = "DLLearnerWebService")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class DLLearnerWS {
+
+	private Map<Integer, ClientState> clients = new TreeMap<Integer,ClientState>();
+	private Random rand=new Random();
+	private static ComponentManager cm = ComponentManager.getInstance();
+	
+	// defines the components, which are accessible for the web service
+	private static Map<String,Class<? extends KnowledgeSource>> knowledgeSourceMapping = new TreeMap<String,Class<? extends KnowledgeSource>>();
+	private static Map<String,Class<? extends ReasonerComponent>> reasonerMapping = new TreeMap<String,Class<? extends ReasonerComponent>>();
+	private static Map<String,Class<? extends LearningProblem>> learningProblemMapping = new TreeMap<String,Class<? extends LearningProblem>>();
+	private static Map<String,Class<? extends LearningAlgorithm>> learningAlgorithmMapping = new TreeMap<String,Class<? extends LearningAlgorithm>>();
+	
+	public DLLearnerWS() {
+		knowledgeSourceMapping.put("owlfile", OWLFile.class);
+		knowledgeSourceMapping.put("sparql", SparqlEndpoint.class);
+		reasonerMapping.put("dig", DIGReasoner.class);
+		learningProblemMapping.put("posNegDefinition", PosNegDefinitionLP.class);
+		learningProblemMapping.put("posNegInclusion", PosNegInclusionLP.class);
+		learningAlgorithmMapping.put("refinement", ROLearner.class);
+	}
+	
+	/**
+	 * Generates a unique ID for the client and initialises a session. 
+	 * Using the ID the client can call the other web service methods. 
+	 * Two calls to this method are guaranteed to return different results. 
+	 * 
+	 * @return A session ID.
+	 */
+	@WebMethod
+	public int generateID() {
+		int id;
+		do {
+			id = rand.nextInt();
+		} while(clients.containsKey(id));
+		clients.put(id, new ClientState());
+		return id;
+	}
+	
+	// returns session state or throws client not known exception
+	private ClientState getState(int id) throws ClientNotKnownException {
+		ClientState state = clients.get(id);
+		if(state==null)
+			throw new ClientNotKnownException(id);
+		return state;
+	}
+	
+	// returns the class which is referred to by the string
+	@SuppressWarnings({"unused"})
+	private Class<? extends Component> getComponent(String component) throws UnknownComponentException {
+		if(knowledgeSourceMapping.containsKey(component))
+			return knowledgeSourceMapping.get(component);
+		else if(reasonerMapping.containsKey(component))
+			return reasonerMapping.get(component);
+		else if(learningProblemMapping.containsKey(component))
+			return learningProblemMapping.get(component);
+		else if(learningAlgorithmMapping.containsKey(component))
+			return learningAlgorithmMapping.get(component);
+		else
+			throw new UnknownComponentException(component);
+	}
+	
+	///////////////////////////////////////
+	// methods for basic component setup //
+	///////////////////////////////////////
+	
+	/**
+	 * Adds a knowledge source.
+	 * 
+	 * @return An identifier for the component.
+	 */
+	@WebMethod
+	public int addKnowledgeSource(int id, String component, String url) throws ClientNotKnownException, UnknownComponentException {
+		ClientState state = getState(id);
+		Class<? extends KnowledgeSource> ksClass = knowledgeSourceMapping.get(component);
+		if(ksClass == null)
+			throw new UnknownComponentException(component);
+		KnowledgeSource ks = cm.knowledgeSource(ksClass);
+		cm.applyConfigEntry(ks, "url", url);
+		return state.addKnowledgeSource(ks);
+	}
+	
+	@WebMethod
+	public void removeKnowledgeSource(int id, int componentID) throws ClientNotKnownException {
+		getState(id).removeKnowledgeSource(componentID);
+	}
+	
+	@WebMethod
+	public int setReasoner(int id, String component) throws ClientNotKnownException, UnknownComponentException {
+		ClientState state = getState(id);
+		Class<? extends ReasonerComponent> rcClass = reasonerMapping.get(component);
+		if(rcClass == null)
+			throw new UnknownComponentException(component);
+		
+		ReasonerComponent rc = cm.reasoner(rcClass, state.getKnowledgeSources());
+		return state.setReasonerComponent(rc);
+	}
+	
+	@WebMethod
+	public int setLearningProblem(int id, String component) throws ClientNotKnownException, UnknownComponentException {
+		ClientState state = getState(id);
+		Class<? extends LearningProblem> lpClass = learningProblemMapping.get(component);
+		if(lpClass == null)
+			throw new UnknownComponentException(component);
+		
+		LearningProblem lp = cm.learningProblem(lpClass, state.getReasoningService());
+		return state.setLearningProblem(lp);
+	}
+	
+	@WebMethod
+	public int setLearningAlgorithm(int id, String component) throws ClientNotKnownException, UnknownComponentException {
+		ClientState state = getState(id);
+		Class<? extends LearningAlgorithm> laClass = learningAlgorithmMapping.get(component);
+		if(laClass == null)
+			throw new UnknownComponentException(component);
+		
+		LearningAlgorithm la = cm.learningAlgorithm(laClass, state.getLearningProblem(), state.getReasoningService());
+		return state.setLearningAlgorithm(la);
+	}
+	
+	/**
+	 * Initialise all components.
+	 * @param id Session ID.
+	 */
+	@WebMethod
+	public void init(int id) throws ClientNotKnownException {
+		ClientState state = getState(id);
+		for(KnowledgeSource ks : state.getKnowledgeSources())
+			ks.init();
+		state.getReasonerComponent().init();
+		state.getLearningProblem().init();
+		state.getLearningAlgorithm().init();
+	}
+	
+	/**
+	 * Starts the learning algorithm and returns the best concept found. This
+	 * method will block until learning is completed.
+	 * 
+	 * @param id Session ID.
+	 * @return The best solution found.
+	 * @throws ClientNotKnownException
+	 */
+	@WebMethod
+	public String learn(int id) throws ClientNotKnownException {
+		ClientState state = getState(id);
+		state.getLearningAlgorithm().start();
+		return state.getLearningAlgorithm().getBestSolution().toString();
+	}
+	
+	/**
+	 * Starts the learning algorithm and returns immediately. The learning
+	 * algorithm is executed in its own thread and can be queried and 
+	 * controlled using other Web Service methods.
+	 * 
+	 * @param id Session ID.
+	 * @throws ClientNotKnownException
+	 */
+	@WebMethod 
+	public void learnThreaded(int id) throws ClientNotKnownException {
+		final ClientState state = getState(id);
+		Thread learningThread = new Thread() {
+			@Override
+			public void run() {
+				state.setAlgorithmRunning(true);
+				state.getLearningAlgorithm().start();
+				state.setAlgorithmRunning(false);
+			}
+		};
+		learningThread.start();
+	}
+	
+	@WebMethod
+	public String getCurrentlyBestConcept(int id) throws ClientNotKnownException {
+		ClientState state = getState(id);
+		return state.getLearningAlgorithm().getBestSolution().toString();
+	}
+	
+	@WebMethod
+	public boolean isAlgorithmRunning(int id) throws ClientNotKnownException {
+		return getState(id).isAlgorithmRunning();
+	}
+	
+	/**
+	 * Stops the learning algorithm smoothly.
+	 * @param id
+	 * @throws ClientNotKnownException
+	 */
+	@WebMethod
+	public void stop(int id) throws ClientNotKnownException {
+		getState(id).getLearningAlgorithm().stop();
+	}
+	
+	/////////////////////////////////////////
+	// methods for component configuration //
+	/////////////////////////////////////////
+	
+	@WebMethod
+	public void setPositiveExamples(int id, String[] positiveExamples) throws ClientNotKnownException {
+		ClientState state = getState(id);
+		Set<String> posExamples = new TreeSet<String>(Arrays.asList(positiveExamples));
+		cm.applyConfigEntry(state.getLearningProblem(), "positiveExamples", posExamples);
+	}
+	
+	@WebMethod
+	public void setNegativeExamples(int id, String[] negativeExamples) throws ClientNotKnownException {
+		ClientState state = getState(id);
+		Set<String> negExamples = new TreeSet<String>(Arrays.asList(negativeExamples));
+		cm.applyConfigEntry(state.getLearningProblem(), "negativeExamples", negExamples);
+	}
+	
+	@WebMethod
+	public void applyConfigEntryInt(int sessionID, int componentID, String optionName, Integer value) throws ClientNotKnownException, UnknownComponentException	{
+		applyConfigEntry(sessionID, componentID,optionName,value);
+	}
+	
+	@WebMethod
+	public void applyConfigEntryString(int sessionID, int componentID, String optionName, String value) throws ClientNotKnownException, UnknownComponentException {
+		applyConfigEntry(sessionID, componentID,optionName,value);
+	}
+	
+	@WebMethod
+	public void applyConfigEntryStringArray(int sessionID, int componentID, String optionName, String[] value) throws ClientNotKnownException, UnknownComponentException {
+		Set<String> stringSet = new TreeSet<String>(Arrays.asList(value));
+		applyConfigEntry(sessionID, componentID,optionName,stringSet);
+	}
+	
+	@WebMethod
+	public void applyConfigEntryBoolean(int sessionID, int componentID, String optionName, Boolean value) throws ClientNotKnownException, UnknownComponentException	{
+		applyConfigEntry(sessionID, componentID,optionName,value);
+	}
+	
+	private void applyConfigEntry(int sessionID, int componentID, String optionName, Object value) throws ClientNotKnownException, UnknownComponentException {
+		ClientState state = getState(sessionID);
+		Component component = state.getComponent(componentID);
+		cm.applyConfigEntry(component, optionName, value);
+	}
+	
+	////////////////////////////////////
+	// reasoning and querying methods //
+	////////////////////////////////////
+	
+	@WebMethod
+	public String[] getAtomicConcepts(int id) throws ClientNotKnownException {
+		Set<AtomicConcept> atomicConcepts = getState(id).getReasoningService().getAtomicConcepts();
+		return Datastructures.sortedSet2StringListConcepts(atomicConcepts);
+	}
+	
+	@WebMethod
+	public String getSubsumptionHierarchy(int id) throws ClientNotKnownException {
+		return getState(id).getReasoningService().toString();
+	}
+	
+	@WebMethod
+	public String[] retrieval(int id, String conceptString) throws ClientNotKnownException {
+		ClientState state = getState(id);
+		// call parser to parse atomic concept
+		Concept concept = null;
+		try {
+			concept = KBParser.parseConcept(conceptString);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Set<Individual> individuals = state.getReasoningService().retrieval(concept);
+		return Datastructures.sortedSet2StringListIndividuals(individuals);
+	}
+	
+	@WebMethod
+	public String[] getAtomicRoles(int id) throws ClientNotKnownException {
+		ClientState state = getState(id);
+		Set<AtomicRole> roles = state.getReasoningService().getAtomicRoles();
+		return Datastructures.sortedSet2StringListRoles(roles);
+	}
+	
+	@WebMethod
+	public String[] getInstances(int id) throws ClientNotKnownException {
+		ClientState state = getState(id);
+		Set<Individual> individuals = state.getReasoningService().getIndividuals();
+		return Datastructures.sortedSet2StringListIndividuals(individuals);
+	}
+	
+	@WebMethod
+	public String[] getIndividualsForARole(int id, String role) throws ClientNotKnownException {
+		ClientState state = getState(id);
+		Map<Individual,SortedSet<Individual>> m = state.getReasoningService().getRoleMembers(new AtomicRole(role));
+		Set<Individual> individuals = m.keySet();
+		return Datastructures.sortedSet2StringListIndividuals(individuals);
+	}
+}

Deleted: trunk/src/dl-learner/org/dllearner/server/DLLearnerWSNew.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWSNew.java	2007-10-16 09:27:26 UTC (rev 226)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWSNew.java	2007-10-16 09:32:08 UTC (rev 227)
@@ -1,350 +0,0 @@
-/**
- * Copyright (C) 2007, Jens Lehmann
- *
- * This file is part of DL-Learner.
- * 
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.server;
-
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.dllearner.algorithms.refinement.ROLearner;
-import org.dllearner.core.Component;
-import org.dllearner.core.ComponentManager;
-import org.dllearner.core.KnowledgeSource;
-import org.dllearner.core.LearningAlgorithm;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
-import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.AtomicRole;
-import org.dllearner.core.dl.Concept;
-import org.dllearner.core.dl.Individual;
-import org.dllearner.kb.OWLFile;
-import org.dllearner.kb.SparqlEndpoint;
-import org.dllearner.learningproblems.PosNegDefinitionLP;
-import org.dllearner.learningproblems.PosNegInclusionLP;
-import org.dllearner.parser.KBParser;
-import org.dllearner.parser.ParseException;
-import org.dllearner.reasoning.DIGReasoner;
-import org.dllearner.utilities.Datastructures;
-
-/**
- * DL-Learner web service interface.
- * 
- * @author Jens Lehmann
- * @author Sebastian Hellmann
- *
- */
-@WebService(name = "DLLearnerWebService")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public class DLLearnerWSNew {
-
-	private Map<Integer, State> clients = new TreeMap<Integer,State>();
-	private Random rand=new Random();
-	private static ComponentManager cm = ComponentManager.getInstance();
-	
-	// defines the components, which are accessible for the web service
-	private static Map<String,Class<? extends KnowledgeSource>> knowledgeSourceMapping = new TreeMap<String,Class<? extends KnowledgeSource>>();
-	private static Map<String,Class<? extends ReasonerComponent>> reasonerMapping = new TreeMap<String,Class<? extends ReasonerComponent>>();
-	private static Map<String,Class<? extends LearningProblem>> learningProblemMapping = new TreeMap<String,Class<? extends LearningProblem>>();
-	private static Map<String,Class<? extends LearningAlgorithm>> learningAlgorithmMapping = new TreeMap<String,Class<? extends LearningAlgorithm>>();
-	
-	public DLLearnerWSNew() {
-		knowledgeSourceMapping.put("owlfile", OWLFile.class);
-		knowledgeSourceMapping.put("sparql", SparqlEndpoint.class);
-		reasonerMapping.put("dig", DIGReasoner.class);
-		learningProblemMapping.put("posNegDefinition", PosNegDefinitionLP.class);
-		learningProblemMapping.put("posNegInclusion", PosNegInclusionLP.class);
-		learningAlgorithmMapping.put("refinement", ROLearner.class);
-	}
-	
-	/**
-	 * Generates a unique ID for the client and initialises a session. 
-	 * Using the ID the client can call the other web service methods. 
-	 * Two calls to this method are guaranteed to return different results. 
-	 * 
-	 * @return A session ID.
-	 */
-	@WebMethod
-	public int generateID() {
-		int id;
-		do {
-			id = rand.nextInt();
-		} while(clients.containsKey(id));
-		clients.put(id, new State());
-		return id;
-	}
-	
-	// returns session state or throws client not known exception
-	private State getState(int id) throws ClientNotKnownException {
-		State state = clients.get(id);
-		if(state==null)
-			throw new ClientNotKnownException(id);
-		return state;
-	}
-	
-	// returns the class which is referred to by the string
-	@SuppressWarnings({"unused"})
-	private Class<? extends Component> getComponent(String component) throws UnknownComponentException {
-		if(knowledgeSourceMapping.containsKey(component))
-			return knowledgeSourceMapping.get(component);
-		else if(reasonerMapping.containsKey(component))
-			return reasonerMapping.get(component);
-		else if(learningProblemMapping.containsKey(component))
-			return learningProblemMapping.get(component);
-		else if(learningAlgorithmMapping.containsKey(component))
-			return learningAlgorithmMapping.get(component);
-		else
-			throw new UnknownComponentException(component);
-	}
-	
-	///////////////////////////////////////
-	// methods for basic component setup //
-	///////////////////////////////////////
-	
-	/**
-	 * Adds a knowledge source.
-	 * 
-	 * @return An identifier for the component.
-	 */
-	@WebMethod
-	public int addKnowledgeSource(int id, String component, String url) throws ClientNotKnownException, UnknownComponentException {
-		State state = getState(id);
-		Class<? extends KnowledgeSource> ksClass = knowledgeSourceMapping.get(component);
-		if(ksClass == null)
-			throw new UnknownComponentException(component);
-		KnowledgeSource ks = cm.knowledgeSource(ksClass);
-		cm.applyConfigEntry(ks, "url", url);
-		return state.addKnowledgeSource(ks);
-	}
-	
-	@WebMethod
-	public void removeKnowledgeSource(int id, int componentID) throws ClientNotKnownException {
-		getState(id).removeKnowledgeSource(componentID);
-	}
-	
-	@WebMethod
-	public int setReasoner(int id, String component) throws ClientNotKnownException, UnknownComponentException {
-		State state = getState(id);
-		Class<? extends ReasonerComponent> rcClass = reasonerMapping.get(component);
-		if(rcClass == null)
-			throw new UnknownComponentException(component);
-		
-		ReasonerComponent rc = cm.reasoner(rcClass, state.getKnowledgeSources());
-		return state.setReasonerComponent(rc);
-	}
-	
-	@WebMethod
-	public int setLearningProblem(int id, String component) throws ClientNotKnownException, UnknownComponentException {
-		State state = getState(id);
-		Class<? extends LearningProblem> lpClass = learningProblemMapping.get(component);
-		if(lpClass == null)
-			throw new UnknownComponentException(component);
-		
-		LearningProblem lp = cm.learningProblem(lpClass, state.getReasoningService());
-		return state.setLearningProblem(lp);
-	}
-	
-	@WebMethod
-	public int setLearningAlgorithm(int id, String component) throws ClientNotKnownException, UnknownComponentException {
-		State state = getState(id);
-		Class<? extends LearningAlgorithm> laClass = learningAlgorithmMapping.get(component);
-		if(laClass == null)
-			throw new UnknownComponentException(component);
-		
-		LearningAlgorithm la = cm.learningAlgorithm(laClass, state.getLearningProblem(), state.getReasoningService());
-		return state.setLearningAlgorithm(la);
-	}
-	
-	/**
-	 * Initialise all components.
-	 * @param id Session ID.
-	 */
-	@WebMethod
-	public void init(int id) throws ClientNotKnownException {
-		State state = getState(id);
-		for(KnowledgeSource ks : state.getKnowledgeSources())
-			ks.init();
-		state.getReasonerComponent().init();
-		state.getLearningProblem().init();
-		state.getLearningAlgorithm().init();
-	}
-	
-	/**
-	 * Starts the learning algorithm and returns the best concept found. This
-	 * method will block until learning is completed.
-	 * 
-	 * @param id Session ID.
-	 * @return The best solution found.
-	 * @throws ClientNotKnownException
-	 */
-	@WebMethod
-	public String learn(int id) throws ClientNotKnownException {
-		State state = getState(id);
-		state.getLearningAlgorithm().start();
-		return state.getLearningAlgorithm().getBestSolution().toString();
-	}
-	
-	/**
-	 * Starts the learning algorithm and returns immediately. The learning
-	 * algorithm is executed in its own thread and can be queried and 
-	 * controlled using other Web Service methods.
-	 * 
-	 * @param id Session ID.
-	 * @throws ClientNotKnownException
-	 */
-	@WebMethod 
-	public void learnThreaded(int id) throws ClientNotKnownException {
-		final State state = getState(id);
-		Thread learningThread = new Thread() {
-			@Override
-			public void run() {
-				state.setAlgorithmRunning(true);
-				state.getLearningAlgorithm().start();
-				state.setAlgorithmRunning(false);
-			}
-		};
-		learningThread.start();
-	}
-	
-	@WebMethod
-	public String getCurrentlyBestConcept(int id) throws ClientNotKnownException {
-		State state = getState(id);
-		return state.getLearningAlgorithm().getBestSolution().toString();
-	}
-	
-	@WebMethod
-	public boolean isAlgorithmRunning(int id) throws ClientNotKnownException {
-		return getState(id).isAlgorithmRunning();
-	}
-	
-	/**
-	 * Stops the learning algorithm smoothly.
-	 * @param id
-	 * @throws ClientNotKnownException
-	 */
-	@WebMethod
-	public void stop(int id) throws ClientNotKnownException {
-		getState(id).getLearningAlgorithm().stop();
-	}
-	
-	/////////////////////////////////////////
-	// methods for component configuration //
-	/////////////////////////////////////////
-	
-	@WebMethod
-	public void setPositiveExamples(int id, String[] positiveExamples) throws ClientNotKnownException {
-		State state = getState(id);
-		Set<String> posExamples = new TreeSet<String>(Arrays.asList(positiveExamples));
-		cm.applyConfigEntry(state.getLearningProblem(), "positiveExamples", posExamples);
-	}
-	
-	@WebMethod
-	public void setNegativeExamples(int id, String[] negativeExamples) throws ClientNotKnownException {
-		State state = getState(id);
-		Set<String> negExamples = new TreeSet<String>(Arrays.asList(negativeExamples));
-		cm.applyConfigEntry(state.getLearningProblem(), "negativeExamples", negExamples);
-	}
-	
-	@WebMethod
-	public void applyConfigEntryInt(int sessionID, int componentID, String optionName, Integer value) throws ClientNotKnownException, UnknownComponentException	{
-		applyConfigEntry(sessionID, componentID,optionName,value);
-	}
-	
-	@WebMethod
-	public void applyConfigEntryString(int sessionID, int componentID, String optionName, String value) throws ClientNotKnownException, UnknownComponentException {
-		applyConfigEntry(sessionID, componentID,optionName,value);
-	}
-	
-	@WebMethod
-	public void applyConfigEntryStringArray(int sessionID, int componentID, String optionName, String[] value) throws ClientNotKnownException, UnknownComponentException {
-		Set<String> stringSet = new TreeSet<String>(Arrays.asList(value));
-		applyConfigEntry(sessionID, componentID,optionName,stringSet);
-	}
-	
-	@WebMethod
-	public void applyConfigEntryBoolean(int sessionID, int componentID, String optionName, Boolean value) throws ClientNotKnownException, UnknownComponentException	{
-		applyConfigEntry(sessionID, componentID,optionName,value);
-	}
-	
-	private void applyConfigEntry(int sessionID, int componentID, String optionName, Object value) throws ClientNotKnownException, UnknownComponentException {
-		State state = getState(sessionID);
-		Component component = state.getComponent(componentID);
-		cm.applyConfigEntry(component, optionName, value);
-	}
-	
-	////////////////////////////////////
-	// reasoning and querying methods //
-	////////////////////////////////////
-	
-	@WebMethod
-	public String[] getAtomicConcepts(int id) throws ClientNotKnownException {
-		Set<AtomicConcept> atomicConcepts = getState(id).getReasoningService().getAtomicConcepts();
-		return Datastructures.sortedSet2StringListConcepts(atomicConcepts);
-	}
-	
-	@WebMethod
-	public String getSubsumptionHierarchy(int id) throws ClientNotKnownException {
-		return getState(id).getReasoningService().toString();
-	}
-	
-	@WebMethod
-	public String[] retrieval(int id, String conceptString) throws ClientNotKnownException {
-		State state = getState(id);
-		// call parser to parse atomic concept
-		Concept concept = null;
-		try {
-			concept = KBParser.parseConcept(conceptString);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		Set<Individual> individuals = state.getReasoningService().retrieval(concept);
-		return Datastructures.sortedSet2StringListIndividuals(individuals);
-	}
-	
-	@WebMethod
-	public String[] getAtomicRoles(int id) throws ClientNotKnownException {
-		State state = getState(id);
-		Set<AtomicRole> roles = state.getReasoningService().getAtomicRoles();
-		return Datastructures.sortedSet2StringListRoles(roles);
-	}
-	
-	@WebMethod
-	public String[] getInstances(int id) throws ClientNotKnownException {
-		State state = getState(id);
-		Set<Individual> individuals = state.getReasoningService().getIndividuals();
-		return Datastructures.sortedSet2StringListIndividuals(individuals);
-	}
-	
-	@WebMethod
-	public String[] getIndividualsForARole(int id, String role) throws ClientNotKnownException {
-		State state = getState(id);
-		Map<Individual,SortedSet<Individual>> m = state.getReasoningService().getRoleMembers(new AtomicRole(role));
-		Set<Individual> individuals = m.keySet();
-		return Datastructures.sortedSet2StringListIndividuals(individuals);
-	}
-}

Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWSStart.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWSStart.java	2007-10-16 09:27:26 UTC (rev 226)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWSStart.java	2007-10-16 09:32:08 UTC (rev 227)
@@ -32,7 +32,7 @@
 		
 		System.out.print("Starting DL-Learner web service at http://" + 
 				isa.getHostName()+":"+isa.getPort()+ "/services ... ");
-		 Endpoint endpoint = Endpoint.create(new DLLearnerWSNew());
+		 Endpoint endpoint = Endpoint.create(new DLLearnerWS());
 		//Endpoint endpoint = Endpoint.create(new CustomDataClass());
 		HttpContext context = server.createContext("/services");
 	     endpoint.publish(context);

Deleted: trunk/src/dl-learner/org/dllearner/server/State.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/State.java	2007-10-16 09:27:26 UTC (rev 226)
+++ trunk/src/dl-learner/org/dllearner/server/State.java	2007-10-16 09:32:08 UTC (rev 227)
@@ -1,209 +0,0 @@
-/**
- * Copyright (C) 2007, Jens Lehmann
- *
- * This file is part of DL-Learner.
- * 
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.server;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
-import org.dllearner.core.Component;
-import org.dllearner.core.KnowledgeSource;
-import org.dllearner.core.LearningAlgorithm;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
-import org.dllearner.core.ReasoningService;
-import org.dllearner.kb.OWLFile;
-import org.dllearner.kb.SparqlEndpoint;
-
-/**
- * Stores the state of a DL-Learner client session.
- * 
- * @author Jens Lehmann
- *
- */
-public class State {
-
-	// stores the mapping between component IDs and component
-	// (note that this allows us to keep all references to components even
-	// if they are note used anymore e.g. a deleted knowledge source)
-	private Map<Integer,Component> componentIDs = new HashMap<Integer,Component>(); 
-	
-	private Set<KnowledgeSource> knowledgeSources = new HashSet<KnowledgeSource>();
-	
-	private LearningProblem learningProblem;
-	
-	private ReasonerComponent reasonerComponent;
-	private ReasoningService reasoningService;
-	
-	private LearningAlgorithm learningAlgorithm;
-
-	private Random rand=new Random();
-	
-	private boolean isAlgorithmRunning = false;
-	
-	private int generateComponentID(Component component) {
-		int id;
-		do {
-			id = rand.nextInt();
-		} while(componentIDs.keySet().contains(id));
-		componentIDs.put(id, component);
-		return id;		
-	}
-	
-	/**
-	 * @return the isAlgorithmRunning
-	 */
-	public boolean isAlgorithmRunning() {
-		return isAlgorithmRunning;
-	}
-
-	/**
-	 * @param isAlgorithmRunning the isAlgorithmRunning to set
-	 */
-	public void setAlgorithmRunning(boolean isAlgorithmRunning) {
-		this.isAlgorithmRunning = isAlgorithmRunning;
-	}
-	
-//	public Component getComponent(Class<? extends Component> componentClass) throws UnknownComponentException {
-//		if(learningProblem.getClass().equals(componentClass))
-//			return learningProblem;
-//		else if(learningAlgorithm.getClass().equals(componentClass))
-//			return learningAlgorithm;
-//		else if(reasonerComponent.getClass().equals(componentClass))
-//			return reasonerComponent;
-//		else if(KnowledgeSource.class.isAssignableFrom(componentClass)) {
-//			
-//			
-//			for(KnowledgeSource ks : knowledgeSources) {
-//				if(ks.getClass().equals(componentClass))
-//					return ks;
-//			}
-//			throw new UnknownComponentException(componentClass.getName());
-//		} else
-//			throw new UnknownComponentException(componentClass.getName());
-//	}
-
-	/**
-	 * Removes a knowledge source with the given URL (independant of its type).
-	 * @param url URL of the OWL file or SPARQL Endpoint.
-	 * @return True if a knowledge source was deleted, false otherwise.
-	 */
-	public boolean removeKnowledgeSource(String url) {
-		Iterator<KnowledgeSource> it = knowledgeSources.iterator(); 
-		while(it.hasNext()) {
-			KnowledgeSource source = it.next();
-			if((source instanceof OWLFile && ((OWLFile)source).getURL().toString().equals(url))
-				|| (source instanceof SparqlEndpoint && ((SparqlEndpoint)source).getURL().toString().equals(url)) ) {
-				it.remove();
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @return the learningProblem
-	 */
-	public LearningProblem getLearningProblem() {
-		return learningProblem;
-	}
-
-	/**
-	 * @param learningProblem the learningProblem to set
-	 */
-	public int setLearningProblem(LearningProblem learningProblem) {
-		this.learningProblem = learningProblem;
-		return generateComponentID(learningProblem);
-	}
-
-	/**
-	 * @return the reasonerComponent
-	 */
-	public ReasonerComponent getReasonerComponent() {
-		return reasonerComponent;
-	}
-
-	/**
-	 * Sets the reasoner component and creates the corresponding
-	 * <code>ReasoningService</code> instance.
-	 * 
-	 * @param reasonerComponent the reasonerComponent to set
-	 */
-	public int setReasonerComponent(ReasonerComponent reasonerComponent) {
-		this.reasonerComponent = reasonerComponent;
-		reasoningService = new ReasoningService(reasonerComponent);
-		return generateComponentID(reasonerComponent);
-	}
-
-	/**
-	 * @return the learningAlgorithm
-	 */
-	public LearningAlgorithm getLearningAlgorithm() {
-		return learningAlgorithm;
-	}
-
-	/**
-	 * @param learningAlgorithm the learningAlgorithm to set
-	 */
-	public int setLearningAlgorithm(LearningAlgorithm learningAlgorithm) {
-		this.learningAlgorithm = learningAlgorithm;
-		return generateComponentID(learningAlgorithm);
-	}
-
-	/**
-	 * @return the reasoningService
-	 */
-	public ReasoningService getReasoningService() {
-		return reasoningService;
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 * @see java.util.Map#get(java.lang.Object)
-	 */
-	public Component getComponent(int id) {
-		return componentIDs.get(id);
-	}
-
-	/**
-	 * @param e
-	 * @return
-	 */
-	public int addKnowledgeSource(KnowledgeSource ks) {
-		knowledgeSources.add(ks);
-		return generateComponentID(ks);
-		
-	}
-
-	public boolean removeKnowledgeSource(int componentID) {
-		return knowledgeSources.remove(componentIDs.get(componentID));
-	}
-	
-	/**
-	 * @return the knowledgeSources
-	 */
-	public Set<KnowledgeSource> getKnowledgeSources() {
-		return knowledgeSources;
-	}
-}

Added: trunk/src/dl-learner/org/dllearner/server/jaxws/package.html
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/jaxws/package.html	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/server/jaxws/package.html	2007-10-16 09:32:08 UTC (rev 227)
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head></head>
+<body bgcolor="white">
+<p>Classes generated by JAXWS.</p>
+</body>
+</html>
\ No newline at end of file

Modified: trunk/src/dl-learner/org/dllearner/server/package.html
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/package.html	2007-10-16 09:27:26 UTC (rev 226)
+++ trunk/src/dl-learner/org/dllearner/server/package.html	2007-10-16 09:32:08 UTC (rev 227)
@@ -2,8 +2,6 @@
 <html>
 <head></head>
 <body bgcolor="white">
-<p>This package implements the DL-Learner server, which handles learning problems according to the "Ontology Class Learning Interface".
-
-TODO: So ein Interface muss natürlich erst spezifiziert werden ...</p>
+<p>This package implements the DL-Learner web service.</p>
 </body>
 </html>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (120)	Sep (36)	Oct (116)	Nov (17)	Dec (44)
2008	Jan (143)	Feb (192)	Mar (74)	Apr (84)	May (105)	Jun (64)	Jul (49)	Aug (120)	Sep (159)	Oct (156)	Nov (51)	Dec (28)
2009	Jan (17)	Feb (55)	Mar (33)	Apr (57)	May (54)	Jun (28)	Jul (6)	Aug (16)	Sep (38)	Oct (30)	Nov (26)	Dec (52)
2010	Jan (7)	Feb (91)	Mar (65)	Apr (2)	May (14)	Jun (25)	Jul (38)	Aug (48)	Sep (80)	Oct (70)	Nov (75)	Dec (77)
2011	Jan (68)	Feb (53)	Mar (51)	Apr (35)	May (65)	Jun (101)	Jul (29)	Aug (230)	Sep (95)	Oct (49)	Nov (110)	Dec (63)
2012	Jan (41)	Feb (42)	Mar (25)	Apr (46)	May (51)	Jun (44)	Jul (45)	Aug (29)	Sep (12)	Oct (9)	Nov (17)	Dec (2)
2013	Jan (12)	Feb (14)	Mar (7)	Apr (16)	May (54)	Jun (27)	Jul (11)	Aug (5)	Sep (85)	Oct (27)	Nov (37)	Dec (32)
2014	Jan (8)	Feb (29)	Mar (5)	Apr (3)	May (22)	Jun (3)	Jul (4)	Aug (3)	Sep	Oct	Nov	Dec

dl-learner-svn Mailing List for DL-Learner (Page 163)

dl-learner-svn — DL-Learner Subversion commits