Changeset 31654

Timestamp:

03/29/09 12:43:45 (4 years ago)

Author:

hoge1e3

Message:

ナイーブな検索スピードアップ

Location:

lang/csharp/soyText/soyText

Files:

• Debug.cs (added)
• Document.cs (modified) (2 diffs)
• DocumentSet.cs (modified) (4 diffs)
• Form1.cs (modified) (5 diffs)
• Token.cs (modified) (2 diffs)
• bin/Debug/soyText.exe (modified) (previous)
• bin/Debug/soyText.pdb (modified) (previous)
• soyText.csproj (modified) (1 diff)

lang/csharp/soyText/soyText/Document.cs

@@ -64 +64 @@
             tx.Write(content);
             tx.Close();
+            _lastUpdate = null;
         }
         public Boolean isNew
@@ -95 +96 @@
             get { return documentSet.getFileName(handle, state); }
         }
-        public DateTime lastUpdate
+        long? _lastUpdate = null;
+        public long lastUpdate
         {
             get
             {
-                return File.GetLastWriteTime(fileName);
+                if (_lastUpdate != null) return (long)_lastUpdate;
+                return (long)(_lastUpdate = File.GetLastWriteTime(fileName).Ticks);
             }
         }

lang/csharp/soyText/soyText/DocumentSet.cs

@@ -34 +34 @@
         public int byRecency(Document d1, Document d2)
         {
-            long d = d1.lastUpdate.Ticks - d2.lastUpdate.Ticks;
+            long d = d1.lastUpdate - d2.lastUpdate;
             return (d == 0 ? 0 : (d < 0 ? 1 : -1));
         }
         public List<Document> getRecents()
         {
+            Debug.print("文書一覧取得中...");
             var res = new List<Document>();
             foreach (string fileName
@@ -49 +50 @@
                 res.Add(createDocument(handle));
             }
+            Debug.print("文書一覧並べ替え中...");
             res.Sort(byRecency);/* delegate(Document d1, Document d2)
             {
@@ -67 +69 @@
             var t = workspace.indexer.createToken(kw);
             var res = new HashSet<Document>();
-
+            Debug.print("文字検索: " + kw);
             foreach (var st in t.existentSuperstrings)
             {
                 res.UnionWith(exactSearch(st));
+            }
+            Debug.print("activeな文書を検索: " + kw);
+            foreach (var d in getRecents())
+            {
+                if (d.matches(kw)) res.Add(d);
             }
             /*
@@ -92 +99 @@
             }*/
             var resList = res.ToList();
+            Debug.print("検索結果の並べ替え: "+kw);
             resList.Sort(byRecency);
+            Debug.print("End: 検索結果の並べ替え: " + kw);
             return resList;
             //return getRecents().FindAll(d => d.matches(kw));

lang/csharp/soyText/soyText/Form1.cs

@@ -14 +14 @@
 namespace SoyText
 {
+    public delegate void SyncUIAction(); 
     public partial class Form1 : Form
     {
@@ -21 +22 @@
         public static Form1 defaultInstance;
         String _statusText = "";
+        Queue<SyncUIAction> uiActionQueue=new Queue<SyncUIAction>();
         public String statusText
         {
@@ -55 +57 @@
         }
         IEnumerator<int> listings;
+        public DocumentSet documentSet
+        {
+            get { return workspace.documentSet; }
+        }
         public void refreshList()
         {
-           //docList.Items.Clear();
-           docListBox.Items.Clear();
-            listings = refreshListLoop(null);
-        }
-        public DocumentSet documentSet
-        {
-            get { return workspace.documentSet; }
-        }
-        public IEnumerator<int> refreshListLoop(String kw) {
-            var cnt = 0;
-            foreach (Document d in  documentSet.search(kw))
-            {
-                //var i = docList.Items.Add("" + d.handle);
-                if (kw==null || d.matches(kw))
-                {
-                    docListBox.Items.Add(d);//"" + d.handle);
+            refreshList(null);
+        }
+        public void refreshList(String kw) {
+            new Thread(delegate()
+            {
+                var cnt = 0;
+                var res = documentSet.search(kw);
+                syncUI(delegate()
+                {
+                    docListBox.Items.Clear();
+                });
+                foreach (Document d in res)
+                {
+                    //var i = docList.Items.Add("" + d.handle);
+                    var d2 = d;
+                    //if (kw == null || d.matches(kw))
+                    //{
+                        syncUI(delegate()
+                        {
+                            docListBox.Items.Add(d2);
+                        });
+                    //}
+                    Thread.Sleep(1);
+                    //if (cnt % 10 == 0) yield return 0;
+                    cnt++;
+                    if (cnt > 100) break;
                 }
-                if (cnt % 10 == 0) yield return 0;
-                cnt++;
-                if (cnt > 100) yield break;
-            }
-        }
-
+                statusText = "完了";
+            }).Start();
+        }
+        public void syncUI(SyncUIAction u)
+        {
+            uiActionQueue.Enqueue(u);
+        }
         private void newDocument()
         {
@@ -103 +120 @@
             if (e.KeyCode.Equals(Keys.Enter))
             {
-                var s=documentSet.search(command.Text);
-                docListBox.Items.Clear();
-                listings = refreshListLoop(command.Text);
+                //var s=documentSet.search(command.Text);
+                refreshList(command.Text);
                 /*
                 var lim = 100;
@@ -132 +148 @@
                     listings = null;
                 }
+            }
+            //Text = "" + uiActionQueue.Count;
+            while (uiActionQueue.Count > 0)
+            {
+                uiActionQueue.Dequeue().Invoke();
             }
         }

lang/csharp/soyText/soyText/Token.cs

@@ -95 +95 @@
         { 
             get {
+                if (!File.Exists(superstringPath)) return 0;
                 return new FileInfo(superstringPath).Length;
             }
@@ -139 +140 @@
                 {
                     if (content.Length == 1) return res;
-
+                    
                     var ct = mostRareChar;
                     foreach (var t in ct.existentSuperstrings)

lang/csharp/soyText/soyText/soyText.csproj

@@ -49 +49 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Debug.cs" />
     <Compile Include="Document.cs" />
     <Compile Include="DocumentSet.cs" />