Changeset 2220

Timestamp:

08/03/09 10:35:04 (15 years ago)

Author:

gkronber

Message:

Deleted unused file GeneralTreeSerializer.cs and commented code. #713

Location:

branches/GP-Refactoring-713/sources

Files:

• HeuristicLab.GP.Interfaces/3.3/IFunctionTreeSerializer.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/SymbolicExpressionExporter.cs (modified) (1 diff)
• HeuristicLab.GP/3.3/GeneralTreeSerializer.cs (deleted)

branches/GP-Refactoring-713/sources/HeuristicLab.GP.Interfaces/3.3/IFunctionTreeSerializer.cs

@@ -30 +30 @@
     string Export(IFunctionTree tree);
     bool TryExport(IFunctionTree tree, out string exported);
-    //IFunctionTree Import(string tree);
-    //bool TryImport(string tree, out IFunctionTree importedTree);
   }
 }

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/SymbolicExpressionExporter.cs

@@ -53 +53 @@
       }
     }
-
-    //public IFunctionTree Import(string tree) {
-    //  Queue<string> tokens = new Queue<string>(tree.Split(' ', '\n', '\t'));
-    //  return ParseTree(tokens);
-    //}
-
-    //private IFunctionTree ParseTree(Queue<string> tokens) {
-    //  Expect("(", tokens);
-    //  string funSymb = tokens.Peek();
-    //  double constValue;
-    //  if (double.TryParse(funSymb, out constValue)) {
-    //    throw new UnknownFunctionException(funSymb);
-    //  }
-    //  switch (funSymb) {
-    //    case "variable": return ParseVariable(tokens);
-    //    case "differential": return ParseDifferential(tokens);
-    //    default: 
-    //      IFunctionTree fNode = ParseFunction(tokens);
-    //      Expect(")", tokens);
-    //      return fNode;
-    //  }
-
-    //}
-
-    //private IFunctionTree ParseFunction(Queue<string> tokens) {
-    //  string symb = tokens.Dequeue();
-    //  IFunctionTree funTree;
-    //  switch (symb) {
-    //    case "+": funTree = new Addition().GetTreeNode(); break;
-    //    case "-": funTree = new Subtraction().GetTreeNode(); break;
-    //    case "*": funTree = new Multiplication().GetTreeNode(); break;
-    //  }
-       
-    //  while (tokens.Peek() == "(") {
-    //    funTree.AddSubTree(ParseTree(tokens));
-    //  }
-    //  return funTree;
-    //}
-
-    //private IFunctionTree ParseDifferential(Queue<string> tokens) {
-    //  string symb = tokens.Dequeue();
-    //  double weight = double.Parse(tokens.Dequeue());
-    //  string name = tokens.Dequeue();
-    //  int sampleOffset = int.Parse(tokens.Dequeue());
-    //  VariableFunctionTree varFunTree = new Differential().GetTreeNode();
-    //  varFunTree.Weight = weight;
-    //  varFunTree.SampleOffset = sampleOffset;
-    //  varFunTree.VariableName = name;
-    //  return varFunTree;
-    //}
-
-    //private IFunctionTree ParseVariable(Queue<string> tokens) {
-    //  string symb = tokens.Dequeue();
-    //  double weight = double.Parse(tokens.Dequeue());
-    //  string name = tokens.Dequeue();
-    //  int sampleOffset = int.Parse(tokens.Dequeue());
-    //  VariableFunctionTree varFunTree = new Variable().GetTreeNode();
-    //  varFunTree.Weight = weight;
-    //  varFunTree.SampleOffset = sampleOffset;
-    //  varFunTree.VariableName = name;
-    //  return varFunTree;
-    //}
-
-    //private void Expect(string p, Queue<string> tokens) {
-    //  var next = tokens.Dequeue();
-    //  if (p != next) throw new FormatException("Expected symbol: " + p + ", found symbol: " + next);
-    //}
-
-    //public bool TryImport(string tree, out IFunctionTree importedTree) {
-    //  try {
-    //    importedTree = Import(tree);
-    //    return true;
-    //  }
-    //  catch (UnknownFunctionException) {
-    //    importedTree = null;
-    //    return false;
-    //  }
-    //}
 
     private void BuildExportString(IFunctionTree tree) {