Changeset 542

Timestamp:

09/04/08 18:41:04 (16 years ago)

Author:

gkronber

Message:

improved operators to write items to the DB and added two operators to extract items from the DB and add them as variables. ticket #261 (Items are stored multiple times in the result entries in the CEDMA DB)

Location:

trunk/sources/HeuristicLab.CEDMA.Operators

Files:

• HeuristicLab.CEDMA.Operators.csproj (modified) (1 diff)
• InjectedVariableExtractor.cs (modified) (5 diffs)
• MakeStatement.cs (modified) (2 diffs)
• SubScopesExtractor.cs (added)
• VariableExtractor.cs (added)

trunk/sources/HeuristicLab.CEDMA.Operators/HeuristicLab.CEDMA.Operators.csproj

@@ -54 +54 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="VariableExtractor.cs" />
+    <Compile Include="SubScopesExtractor.cs" />
     <Compile Include="OntologyExtractor.cs" />
     <Compile Include="ResultsExtractor.cs" />

trunk/sources/HeuristicLab.CEDMA.Operators/InjectedVariableExtractor.cs

@@ -41 +41 @@
       AddVariableInfo(new VariableInfo("AgentId", "Id of the agent to extract injected variables from.", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("CedmaServerUri", "Uri of the CEDMA server", typeof(StringData), VariableKind.In));
-      AddVariableInfo(new VariableInfo("VariableName", "Name of the injected variable that should be extracted", typeof(StringData), VariableKind.In));
+      AddVariableInfo(new VariableInfo("VariableNames", "The names of injected variables that should be extracted", typeof(ItemList<StringData>), VariableKind.In));
     }
 
@@ -47 +47 @@
       string serverUrl = GetVariableValue<StringData>("CedmaServerUri", scope, true).Data;
       long agentId = GetVariableValue<IntData>("AgentId", scope, true).Data;
-      string variableName = GetVariableValue<StringData>("VariableName", scope, true).Data;
+      ItemList<StringData> variableNames = GetVariableValue<ItemList<StringData>>("VariableNames", scope, true);
 
       NetTcpBinding binding = new NetTcpBinding();
@@ -56 +56 @@
       using(ChannelFactory<IDatabase> factory = new ChannelFactory<IDatabase>(binding)) {
         IDatabase database = factory.CreateChannel(new EndpointAddress(serverUrl));
-        IOperatorGraph opGraph = (IOperatorGraph)PersistenceManager.RestoreFromGZip(database.GetAgentRawData(agentId));        
+        IOperatorGraph opGraph = (IOperatorGraph)PersistenceManager.RestoreFromGZip(database.GetAgentRawData(agentId));
         OperatorLinkPatcher.LinkDatabase(opGraph, database);
-        IVariable var = FindInjectedVariable(database, variableName, opGraph);
-        if(var != null) {
+        List<IVariable> vars = FindInjectedVariable(database, variableNames, opGraph);
+        foreach(IVariable var in vars) {
           scope.AddVariable(var);
         }
@@ -66 +66 @@
     }
 
-    private IVariable FindInjectedVariable(IDatabase database, string variableName, IOperatorGraph opGraph) {
+    private List<IVariable> FindInjectedVariable(IDatabase database, ItemList<StringData> variableNames, IOperatorGraph opGraph) {
+      List<IVariable> vars = new List<IVariable>();
       foreach(IOperator op in opGraph.Operators) {
-        IVariable var = FindInjectedVariable(database, variableName, op);
-        if(var != null) return var;
+        vars.AddRange(FindInjectedVariable(database, variableNames, op));
       }
-      return null;
+      return vars;
     }
 
-    private IVariable FindInjectedVariable(IDatabase database, string variableName, IOperator op) {
-      IVariable var = op.GetVariable(variableName);
-      if(var != null) return var;
-      else if(op is CombinedOperator) {
-        var = FindInjectedVariable(database, variableName, ((CombinedOperator)op).OperatorGraph);
+    private List<IVariable> FindInjectedVariable(IDatabase database, ItemList<StringData> variableNames, IOperator op) {
+      List<IVariable> vars = new List<IVariable>();
+      List<string> missingVariables = new List<string>();
+      foreach(StringData variableName in variableNames) missingVariables.Add(variableName.Data);
+      foreach(string variableName in missingVariables) {
+        IVariable var = op.GetVariable(variableName);
+        if(var != null) {
+          vars.Add(var);
+          variableNames.Remove(new StringData(variableName));
+        }
+      }
+      if(op is CombinedOperator) {
+        vars.AddRange(FindInjectedVariable(database, variableNames, ((CombinedOperator)op).OperatorGraph));
       } else if(op is OperatorLink) {
         OperatorLink link = op as OperatorLink;
@@ -86 +94 @@
         link.Operator = target;
 
-        var = FindInjectedVariable(database, variableName, link.Operator);
+        vars.AddRange(FindInjectedVariable(database, variableNames, link.Operator));
       }
-      return var;
+      return vars;
     }
   }

trunk/sources/HeuristicLab.CEDMA.Operators/MakeStatement.cs

@@ -39 +39 @@
     public MakeStatement()
       : base() {
-      AddVariableInfo(new VariableInfo("AgentId", "Id of the agent to extract injected variables from.", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("CedmaServerUri", "Uri of the CEDMA server", typeof(StringData), VariableKind.In));
       AddVariableInfo(new VariableInfo("Subject", "", typeof(IItem), VariableKind.In));
@@ -48 +47 @@
     public override IOperation Apply(IScope scope) {
       string serverUrl = GetVariableValue<StringData>("CedmaServerUri", scope, true).Data;
-      long agentId = GetVariableValue<IntData>("AgentId", scope, true).Data;
       IItem subject = GetVariableValue<IItem>("Subject", scope, true);
       IItem predicate = GetVariableValue<IItem>("Predicate", scope, true);