Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
yakovypg committed Jul 1, 2022
2 parents 94fcd5b + fbc06f2 commit 2a13d27
Show file tree
Hide file tree
Showing 15 changed files with 9 additions and 54 deletions.
4 changes: 1 addition & 3 deletions core/IndexEngine/Containers/ActiveDate.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;

namespace IndexEngine.Containers
namespace IndexEngine.Containers
{
// Do not use MessageId in the Equals(), GetHashCode(), operator==()

Expand Down
7 changes: 1 addition & 6 deletions core/IndexEngine/Containers/ActiveDateParser.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

namespace IndexEngine.Containers
namespace IndexEngine.Containers
{
public static class ActiveDateParser
{
Expand Down
3 changes: 0 additions & 3 deletions core/IndexEngine/Containers/DynamicMessage.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using IndexEngine.Data.Paths;
using IndexEngine.Indexes;
using Lucene.Net.Documents;
using System;
using System.Collections.Generic;
using System.Linq;

namespace IndexEngine.Containers
{
Expand Down
6 changes: 1 addition & 5 deletions core/IndexEngine/Containers/Project.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;

namespace IndexEngine.Containers
namespace IndexEngine.Containers
{
public class Project
{
Expand Down
2 changes: 0 additions & 2 deletions core/IndexEngine/Data/Paths/ProjectData.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using CSharpTest.Net.Collections;
using IndexEngine.Containers;
using System;
using System.Collections.Generic;
using System.Drawing;

namespace IndexEngine.Data.Paths
Expand Down
2 changes: 0 additions & 2 deletions core/IndexEngine/Data/Paths/ProjectInfo.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using IndexEngine.Containers;
using IndexEngine.Indexes;
using System.Collections.Generic;
using System.IO;
using System.Reflection;

namespace IndexEngine.Data.Paths
Expand Down
7 changes: 2 additions & 5 deletions core/IndexEngine/Data/Paths/ToolInfo.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.IO;

namespace IndexEngine.Data.Paths
namespace IndexEngine.Data.Paths
{
public static class ToolInfo
{
Expand All @@ -16,7 +13,7 @@ public static class ToolInfo
public static string ExtractorConfigPath { get; private set; } = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\CCA\extractorconfig.txt";

public static string HistogramsPath { get; private set; } = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\CCA\histograms.json";

public static string RecentProjectsPath { get; private set; } = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\CCA\recentprojects.txt";
public static string TagsetColorIndexPath { get; private set; } = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\CCA\tagsetscolors.txt";
public static string UserDictsPath { get; private set; } = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\CCA\user_dicts.txt";
Expand Down
4 changes: 1 addition & 3 deletions core/IndexEngine/Indexes/Index.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Collections.Generic;

namespace IndexEngine.Indexes
namespace IndexEngine.Indexes
{
public interface IIndex<TKey, TValue> : IUnloadable
{
Expand Down
6 changes: 1 addition & 5 deletions core/IndexEngine/Indexes/IndexHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
using IndexEngine.Search;
using Lucene.Net.Documents;
using SoftCircuits.CsvParser;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using Wintellect.PowerCollections;

namespace IndexEngine.Indexes
Expand Down Expand Up @@ -432,7 +428,7 @@ public static int PopulateIndex(string filePath, string[] allFields, bool header

//TODO: Still need to redesign this. Rework storing/indexing paradigm.
}

LuceneService.Writer.AddDocument(document);

if (count % PERIOD_OF_SAVING_INTERMEDIATE_RESULTS_OF_POPULATING_INDEX == 0)
Expand Down
4 changes: 0 additions & 4 deletions core/IndexEngine/Indexes/SituationIndex.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using IndexEngine.Data.Paths;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

namespace IndexEngine.Indexes
{
Expand Down
3 changes: 0 additions & 3 deletions core/IndexEngine/Indexes/TagsetIndex.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
using CSharpTest.Net.Collections;
using IndexEngine.Data.Paths;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;

namespace IndexEngine.Indexes
{
Expand Down
6 changes: 1 addition & 5 deletions core/IndexEngine/Indexes/UserDictsIndex.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using IndexEngine.Data.Paths;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

namespace IndexEngine.Indexes
{
Expand Down Expand Up @@ -76,7 +72,7 @@ public void ReadIndexFromDisk()
{
if (!CheckFiles())
return;

ImportIndex(ToolInfo.UserDictsPath);
}

Expand Down
3 changes: 0 additions & 3 deletions core/IndexEngine/Search/LuceneService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
using Lucene.Net.Search;
using Lucene.Net.Store;
using Lucene.Net.Util;
using System.Collections.Generic;
using System.IO;
using System.Linq;

namespace IndexEngine.Search
{
Expand Down
1 change: 0 additions & 1 deletion core/IndexEngine/Search/NGramAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Lucene.Net.Analysis.Shingle;
using Lucene.Net.Analysis.Standard;
using Lucene.Net.Util;
using System.IO;


namespace IndexEngine.Search
Expand Down
5 changes: 1 addition & 4 deletions core/IndexEngine/Search/RakeAlgorithm.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Reflection;
using System.Text.RegularExpressions;

namespace IndexEngine.Search
Expand Down

0 comments on commit 2a13d27

Please sign in to comment.