Moved GetName and SetName to ParseTree, and updated ParallelTreeBankDrawable.

Author: Olcay Taner YILDIZ

AnnotatedTree/AnnotatedTree.csproj

@@ -9,7 +9,7 @@
 
     <ItemGroup>
       <PackageReference Include="NlpToolkit-AnnotatedSentence" Version="1.0.20" />
-      <PackageReference Include="NlpToolkit-ParseTree" Version="1.0.6" />
+      <PackageReference Include="NlpToolkit-ParseTree" Version="1.0.8" />
       <PackageReference Include="NlpToolkit-Util" Version="1.0.4" />
     </ItemGroup>
 

AnnotatedTree/ParallelTreeBankDrawable.cs

@@ -1,49 +1,10 @@
-using System;
 using AnnotatedSentence;
+using ParseTree;
 
 namespace AnnotatedTree
 {
-    public class ParallelTreeBankDrawable
+    public class ParallelTreeBankDrawable : ParallelTreeBank
     {
-        private readonly TreeBankDrawable _fromTreeBank;
-        private readonly TreeBankDrawable _toTreeBank;
-
-        private void RemoveDifferentTrees()
-        {
-            int i, j;
-            i = 0;
-            j = 0;
-            while (i < _fromTreeBank.Size() && j < _toTreeBank.Size())
-            {
-                if (string.Compare(_fromTreeBank.Get(i).GetName(), _toTreeBank.Get(j).GetName(), StringComparison.Ordinal) < 0)
-                {
-                    _fromTreeBank.RemoveTree(i);
-                }
-                else
-                {
-                    if (string.Compare(_toTreeBank.Get(j).GetName(), _fromTreeBank.Get(i).GetName(), StringComparison.Ordinal) < 0)
-                    {
-                        _toTreeBank.RemoveTree(j);
-                    }
-                    else
-                    {
-                        i++;
-                        j++;
-                    }
-                }
-            }
-
-            while (i < _fromTreeBank.Size())
-            {
-                _fromTreeBank.RemoveTree(i);
-            }
-
-            while (j < _toTreeBank.Size())
-            {
-                _toTreeBank.RemoveTree(j);
-            }
-        }
-
         public ParallelTreeBankDrawable(string folder1, string folder2)
         {
             _fromTreeBank = new TreeBankDrawable(folder1);
@@ -58,29 +19,24 @@ public ParallelTreeBankDrawable(string folder1, string folder2, string pattern)
             RemoveDifferentTrees();
         }
 
-        public int Size()
-        {
-            return _fromTreeBank.Size();
-        }
-
         public ParseTreeDrawable FromTree(int index)
         {
-            return _fromTreeBank.Get(index);
+            return (ParseTreeDrawable) _fromTreeBank.Get(index);
         }
 
         public ParseTreeDrawable ToTree(int index)
         {
-            return _toTreeBank.Get(index);
+            return (ParseTreeDrawable) _toTreeBank.Get(index);
         }
 
         public TreeBankDrawable FromTreeBank()
         {
-            return _fromTreeBank;
+            return (TreeBankDrawable) _fromTreeBank;
         }
 
         public TreeBankDrawable ToTreeBank()
         {
-            return _toTreeBank;
+            return (TreeBankDrawable) _toTreeBank;
         }
 
         public double InterAnnotatorGlossAgreement(ViewLayerType viewLayerType)
@@ -91,7 +47,7 @@ public double InterAnnotatorGlossAgreement(ViewLayerType viewLayerType)
                 var parseTree1 = _fromTreeBank.Get(i);
                 var parseTree2 = _toTreeBank.Get(i);
                 total += parseTree1.LeafCount();
-                agreement += parseTree1.GlossAgreementCount(parseTree2, viewLayerType);
+                agreement += ((ParseTreeDrawable) parseTree1).GlossAgreementCount(parseTree2, viewLayerType);
             }
 
             return agreement / (total + 0.0);
@@ -105,7 +61,7 @@ public double InterAnnotatorStructureAgreement()
                 var parseTree1 = _fromTreeBank.Get(i);
                 var parseTree2 = _toTreeBank.Get(i);
                 total += parseTree1.NodeCountWithMultipleChildren();
-                agreement += parseTree1.StructureAgreementCount(parseTree2);
+                agreement += ((ParseTreeDrawable) parseTree1).StructureAgreementCount(parseTree2);
             }
 
             return agreement / (total + 0.0);

AnnotatedTree/ParseTreeDrawable.cs

@@ -12,7 +12,6 @@ namespace AnnotatedTree
     public class ParseTreeDrawable : ParseTree.ParseTree
     {
         private FileDescription _fileDescription;
-        private string _name;
 
         public ParseTreeDrawable(string path, string rawFileName) : this(new FileDescription(path, rawFileName))
         {
@@ -91,16 +90,6 @@ public ParseTreeDrawable(string fileName)
             streamReader.Close();
         }
 
-        public void SetName(string name)
-        {
-            this._name = name;
-        }
-
-        public string GetName()
-        {
-            return _name;
-        }
-
         public void NextTree(int count)
         {
             if (_fileDescription.NextFileExists(count))

AnnotatedTree/TreeBankDrawable.cs

@@ -24,21 +24,6 @@ public TreeBankDrawable(List<ParseTree.ParseTree> parseTrees)
             this.parseTrees = parseTrees;
         }
 
-        private string RemovePath(string fileName)
-        {
-            if (fileName.Contains("/"))
-            {
-                return fileName.Substring(fileName.LastIndexOf("/", StringComparison.Ordinal) + 1);
-            }
-
-            if (fileName.Contains("\\"))
-            {
-                return fileName.Substring(fileName.LastIndexOf("\\", StringComparison.Ordinal) + 1);
-            }
-
-            return fileName;
-        }
-
         public void ReadTree(string path, string fileName)
         {
             var parseTree = new ParseTreeDrawable(fileName);
@@ -107,9 +92,9 @@ public TreeBankDrawable(string path, string extension, Interval interval)
         public TreeBankDrawable(string path, string extension, int from, int to)
         {
             parseTrees = new List<ParseTree.ParseTree>();
-            for (int i = from; i <= to; i++)
+            for (var i = from; i <= to; i++)
             {
-                ParseTreeDrawable parseTree = new ParseTreeDrawable(new FileDescription(path, extension, i));
+                var parseTree = new ParseTreeDrawable(new FileDescription(path, extension, i));
                 if (parseTree.GetRoot() != null)
                 {
                     parseTrees.Add(parseTree);