levenshtein_ruby 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb379a79e2c3034d61394525d1034e5f11e03924
-  data.tar.gz: 1d77d454cc58877aeab23b7dd033e0138d7f69d9
+  metadata.gz: 3a8efe75bc5567183bb5e5da4d984cf6261357e0
+  data.tar.gz: d670a7c6b049833e2a39daabd687e0cb33a6c2f9
 SHA512:
-  metadata.gz: dd378306f85623da0398464538a84b2f06914a8b5eaac9d8728c4727a93c1abfa8db4d01455c907bc50f94ba9ac16f62f346636bb3e5d9c959e99b01211ed0b9
-  data.tar.gz: 8081d6a580e61bdc2f371d8e3746db8753ce481aeafee0223a3fe271e5eb95ef626f3404d5ac31f29f4863d5bb53a10708f9417b3c8548c46255f17b06753acd
+  metadata.gz: a963b3fda4118b3311b6c1d06f3027927ebf941e6330cbf44f84a6f3cc2dbbb724045a1c4a1f2645f74f31e0f9f491bbd5499d208116699df8ff42a63c1f6630
+  data.tar.gz: 5e4850d3cbd97057b9f52642d8762d0a7b4804fac7c8fc263ca7ab17afe2d107ccf3ea6de08e3846f816f642f5ec68c5a92131d4569d9057afa2abddc160765d

data/.gitignore

@@ -10,3 +10,5 @@
 *.o
 .RUBYARCHDIR.time
 *.bundle
+**/*.out
+**/a.out.dSYM/

data/ext/levenshtein_ruby/.env

@@ -0,0 +1,2 @@
+#!/bin/sh
+export LD_LIBRARY_PATH=/usr/local/lib

data/ext/levenshtein_ruby/distance.c

@@ -0,0 +1,80 @@
+#include "distance.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int* get_point(int** double_pointer, int x, int y)
+{
+    return *(double_pointer + x) + y;
+}
+
+void set_point(int** double_pointer, int x, int y, int value)
+{
+    *(*(double_pointer + x) + y) = value;
+}
+
+int distance(const char* word1, const char* word2)
+{
+    int i;
+    int len1 = strlen(word1);
+    int len2 = strlen(word2);
+    int result;
+    int** matrix;
+    matrix = (int**)malloc((len1+1) * sizeof(int*));
+
+    for(i = 0; i <= len1; i++) {
+      *(matrix + i) = (int*)malloc((len2+1) * sizeof(int));
+    }
+
+    for (i = 0; i <= len1; i++) {
+      set_point(matrix, i, 0, i);
+    }
+
+    for (i = 0; i <= len2; i++) {
+      set_point(matrix, 0, i, i);
+    }
+
+    for (i = 1; i <= len1; i++) {
+        int j;
+        char c1;
+        c1 = word1[i-1];
+        for (j = 1; j <= len2; j++) {
+            char c2;
+
+            c2 = word2[j-1];
+            if (c1 == c2) {
+                set_point(matrix, i, j, *get_point(matrix, i-1, j-1));
+            }
+            else {
+                int delete;
+                int insert;
+                int substitute;
+                int minimum;
+
+                delete = *get_point(matrix, i-1, j) + 1;
+                insert = *get_point(matrix, i, j-1) + 1;
+                substitute = *get_point(matrix, i-1, j-1) + 1;
+                minimum = delete;
+                if (insert < minimum) {
+                    minimum = insert;
+                }
+                if (substitute < minimum) {
+                    minimum = substitute;
+                }
+                set_point(matrix, i, j, minimum);
+            }
+        }
+    }
+      result = *get_point(matrix, len1, len2);
+    free(matrix);
+    return result;
+}
+
+int main(){
+    char word1[256];
+    char word2[256];
+    scanf("%s", word1);
+    scanf("%s", word2);
+    printf("%d\n", distance(word1, word2));
+}
+

data/ext/levenshtein_ruby/distance.h

@@ -0,0 +1 @@
+int distance(const char* word1, const char* word2);

data/ext/levenshtein_ruby/input.txt

@@ -0,0 +1,2 @@
+add
+add

data/ext/levenshtein_ruby/levenshtein_ruby.c

@@ -1,56 +1,16 @@
 #include <stdio.h>
 #include <ruby.h>
+#include "distance.h"
 
 VALUE cLevenshtein;
 
 
 VALUE distance_func(VALUE self, VALUE s_word1, VALUE s_word2)
 {
+
     char* word1 = StringValuePtr(s_word1);
     char* word2 = StringValuePtr(s_word2);
-    int len1 = strlen(word1);
-    int len2 = strlen(word2);
-    int matrix[len1 + 1][len2 + 1];
-    int i;
-    for (i = 0; i <= len1; i++) {
-        matrix[i][0] = i;
-    }
-    for (i = 0; i <= len2; i++) {
-        matrix[0][i] = i;
-    }
-    for (i = 1; i <= len1; i++) {
-        int j;
-        char c1;
-
-        c1 = word1[i-1];
-        for (j = 1; j <= len2; j++) {
-            char c2;
-
-            c2 = word2[j-1];
-            if (c1 == c2) {
-                matrix[i][j] = matrix[i-1][j-1];
-            }
-            else {
-                int delete;
-                int insert;
-                int substitute;
-                int minimum;
-
-                delete = matrix[i-1][j] + 1;
-                insert = matrix[i][j-1] + 1;
-                substitute = matrix[i-1][j-1] + 1;
-                minimum = delete;
-                if (insert < minimum) {
-                    minimum = insert;
-                }
-                if (substitute < minimum) {
-                    minimum = substitute;
-                }
-                matrix[i][j] = minimum;
-            }
-        }
-    }
-    return INT2NUM(matrix[len1][len2]);
+    return INT2NUM(distance(word1, word2));
 }
 
 void Init_levenshtein_ruby()

data/ext/levenshtein_ruby/test/distance_unit.c

@@ -0,0 +1,23 @@
+#include <CUnit/CUnit.h>
+#include <CUnit/Console.h>
+#include "../distance.h"
+
+void test_dist_001(void);
+
+int main() {
+  CU_pSuite dist_suite;
+
+  CU_initialize_registry();
+  dist_suite = CU_add_suite("Distance", NULL, NULL);
+  CU_add_test(dist_suite, "test_001", test_dist_001);
+  CU_console_run_tests();
+  CU_cleanup_registry();
+
+  return(0);
+}
+
+void test_dist_001(void) {
+
+  CU_ASSERT(distance("ads", "asd") == 1);
+}
+

data/lib/levenshtein_ruby.rb

@@ -2,9 +2,8 @@ require "levenshtein_ruby/version"
 require "levenshtein_ruby/levenshtein_ruby"
 
 module Levenshtein
-  def self.normalized_distance(a1, a2, threshold=nil, options={})
+  def self.normalized_distance(a1, a2)
     size  = [a1.size, a2.size].max
-
     if a1.size == 0 and a2.size == 0
       0.0
     elsif a1.size == 0
@@ -12,15 +11,7 @@ module Levenshtein
     elsif a2.size == 0
       a1.size.to_f/size
     else
-      if threshold
-        if d = self.distance(a1, a2, (threshold*size).to_i+1)
-          d.to_f/size
-        else
-          nil
-        end
-      else
-        self.distance(a1, a2).to_f/size
-      end
+      self.distance(a1, a2).to_f/size
     end
   end
 end

data/lib/levenshtein_ruby/version.rb

@@ -1,3 +1,3 @@
 class LevenshteinRuby
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: levenshtein_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - meriy100
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,10 +71,18 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- ext/levenshtein_ruby/.env
+- ext/levenshtein_ruby/a.out.dSYM/Contents/Info.plist
+- ext/levenshtein_ruby/distance
+- ext/levenshtein_ruby/distance.c
+- ext/levenshtein_ruby/distance.h
 - ext/levenshtein_ruby/extconf.rb
+- ext/levenshtein_ruby/input.txt
 - ext/levenshtein_ruby/levenshtein_ruby.c
+- ext/levenshtein_ruby/test/distance_unit.c
 - levenshtein_ruby-0.1.0.gem
 - levenshtein_ruby-0.1.1.gem
+- levenshtein_ruby-0.1.3.gem
 - levenshtein_ruby.gemspec
 - lib/levenshtein_ruby.rb
 - lib/levenshtein_ruby/version.rb