updates from experimentally moving the modules to DTables

JuliaData · Nov 16, 2022 · 57ff04c · 57ff04c
1 parent c78adbc
commit 57ff04c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/src/DataFrames.jl b/src/DataFrames.jl
@@ -16,8 +16,8 @@ using .SeparateModuleIndex
 import .SeparateModuleIndex: _names, index, rename!
 
 include("new_module/SeparateModule.jl")
-using .SeparateModule
-import .SeparateModule: normalize_selection, manipulate
+using .SeparateModule: normalize_selection, make_pair_concrete, broadcast_pair
+import .SeparateModule: normalize_selection
 
 import SnoopPrecompile
 
@@ -140,7 +140,6 @@ const METADATA_FIXED =
     """
 
 include("other/utils.jl")
-# include("other/index.jl")
 
 include("abstractdataframe/abstractdataframe.jl")
 include("dataframe/dataframe.jl")

diff --git a/src/new_module/SeparateModule.jl b/src/new_module/SeparateModule.jl
@@ -11,6 +11,6 @@ import ..SeparateModuleIndex: funname
 
 include("selection.jl")
 
-export normalize_selection, make_pair_concrete, broadcast_pair, manipulate
+export normalize_selection, make_pair_concrete, broadcast_pair
 
 end
diff --git a/src/new_module/selection.jl b/src/new_module/selection.jl
@@ -332,5 +332,3 @@ function normalize_selection(idx::AbstractIndex,
 
     return combine_src => fun => newcol
 end
-
-function manipulate end
diff --git a/src/new_module_index/SeparateModuleIndex.jl b/src/new_module_index/SeparateModuleIndex.jl
@@ -1,6 +1,6 @@
 module SeparateModuleIndex
 using Unicode: Unicode
-using REPL: REPL
+using REPL: levenshtein
 using DataAPI: All, Between, Cols, DataAPI, nrow
 using InvertedIndices: InvertedIndices, Not
 using Printf: @sprintf
@@ -15,5 +15,5 @@ export
     _findall, add_names, funname, SubIndex, _names,
     AsTable, ColumnIndex, MultiColumnIndex, Index,
     COLUMNINDEX_STR, MULTICOLUMNINDEX_STR, SymbolOrString, AbstractIndex,
-    MULTICOLUMNINDEX_TUPLE, make_unique, index,parentcols,rename!,fuzzymatch, make_unique!, _norm_eq, _julia_charmap
+    MULTICOLUMNINDEX_TUPLE, make_unique, index, parentcols,rename!,fuzzymatch, make_unique!, _norm_eq, _julia_charmap
 end
diff --git a/src/new_module_index/index.jl b/src/new_module_index/index.jl
@@ -261,7 +261,7 @@ end
 # Returns candidates ordered by (distance, name) pair
 function fuzzymatch(l::Dict{Symbol, Int}, idx::Symbol)
         idxs = uppercase(string(idx))
-        dist = [(REPL.levenshtein(uppercase(string(x)), idxs), x) for x in keys(l)]
+        dist = [(levenshtein(uppercase(string(x)), idxs), x) for x in keys(l)]
         sort!(dist)
         c = [count(x -> x[1] <= i, dist) for i in 0:2]
         maxd = max(0, searchsortedlast(c, 8) - 1)