-add: direct conversion method from IEnumerable<string> to

IEnumerable<TokenWrapper>
yas4891 · May 4, 2012 · f1fafb9 · f1fafb9
1 parent 65c622f
commit f1fafb9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/GSTAppLogic/app/model/ComparisonModel.cs b/GSTAppLogic/app/model/ComparisonModel.cs
@@ -50,12 +50,13 @@ public ComparisonModel(IEnumerable<TokenWrapper> tokens, IEnumerable<SourceEntit
         /// </summary>
         public void Start()
         {
-            var gstTokenList = Tokens.ToGSTTokenList();
-
             int max = 0;
             foreach (var data in ReferenceData)
             {
-                var referenceTokens = data.Tokens.GetTokens().ToGSTTokenList();
+                // create the list here, because this way it is local to this run
+                // ==> more functional and separated
+                var gstTokenList = Tokens.ToGSTTokenList(); 
+                var referenceTokens = data.Tokens.ToGSTTokenList();
                 var algorithm = new GSTAlgorithm<GSTToken<TokenWrapper>>(gstTokenList, referenceTokens)
                 {
                     MinimumMatchLength = DEFAULT_MML

diff --git a/GSTAppLogic/ext/LexerExtensions.cs b/GSTAppLogic/ext/LexerExtensions.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using CTokenizer;
 using GSTLibrary.token;
 using Tokenizer;
 
@@ -12,6 +13,15 @@ public static GSTTokenList<GSTToken<TokenWrapper>> ToGSTTokenList(this IEnumerab
             return new GSTTokenList<GSTToken<TokenWrapper>>(tokens.Select(token => new GSTToken<TokenWrapper>(token)));
         }
 
-
+        /// <summary>
+        /// converts the string representations of the tokens into appropriately wrapped objects
+        /// </summary>
+        /// <param name="tokens"></param>
+        /// <returns></returns>
+        public static GSTTokenList<GSTToken<TokenWrapper>> ToGSTTokenList(this IEnumerable<string> tokens)
+        {
+            var enumTokens = tokens.GetTokens();
+            return new GSTTokenList<GSTToken<TokenWrapper>>(enumTokens.Select(token => new GSTToken<TokenWrapper>(token)));
+        }
     }
 }
diff --git a/GSTLibrary/tile/GSTAlgorithm.cs b/GSTLibrary/tile/GSTAlgorithm.cs
@@ -316,7 +316,5 @@ private int CalculateMatchLength(int offsetA, int offsetB)
 
             return index;
         }
-
-
     }
 }
diff --git a/GSTTests.VisualState.xml b/GSTTests.VisualState.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VisualState xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ShowCheckBoxes="true">
-  <TopNode>[0-1014]GSTLibrary.test.tile.GSTAlgorithmTest.MatchesTwoDifferentTiles</TopNode>
-  <SelectedNode>[0-1036]GSTConsole.test.GeneralHelperTest.GetStudentIdentifier</SelectedNode>
+  <TopNode>[0-1000]D:\wissen\csharp\GreedyStringTiling\GSTTests.nunit</TopNode>
+  <SelectedNode>[0-1000]D:\wissen\csharp\GreedyStringTiling\GSTTests.nunit</SelectedNode>
   <ExcludeCategories>false</ExcludeCategories>
   <Nodes>
     <Node UniqueName="[0-1000]D:\wissen\csharp\GreedyStringTiling\GSTTests.nunit" Expanded="true" />

diff --git a/Tokenizer/TokenType.cs b/Tokenizer/TokenType.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Tokenizer
 {
@@ -13,23 +10,14 @@ public class TokenType
         public Int32 Type { get; set; }
 
 
-        // override object.Equals
         public override bool Equals(object obj)
         {
-            //       
-            // See the full list of guidelines at
-            //   http://go.microsoft.com/fwlink/?LinkID=85237  
-            // and also the guidance for operator== at
-            //   http://go.microsoft.com/fwlink/?LinkId=85238
-            //
-
             if (obj == null || GetType() != obj.GetType())
             {
                 return false;
             }
 
-            return Type == ((TokenType)obj).Type;
-
+            return Type == ((TokenType)obj).Type;   
         }
 
         public override int GetHashCode()