StrIdx 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7655b6bd71bca58c86ad607fd197933fc19b97b3ae1c76e322ec0432025dad7
-  data.tar.gz: 2421892aa6fe750213d08e2254019d87ce7abb10496cdf1635a61815b8b8b0d7
+  metadata.gz: 6d559876ad4cbf26be66db682e45701f80359d9b4752fdc61042c665f62c3000
+  data.tar.gz: 6c0aa9cce9cea114ada2d1dfb08a833f2d338a3d9815c2a5dc32ceb15186bfe7
 SHA512:
-  metadata.gz: 0a0ed3f51b95b72a553cf97e1a852f63e8b6d1cbbba56fdab55ed5037ef4d658b8649f2cf92d35b5eea4e6657a18a3a1460a3a57069cda0889a1987f5d1611ee
-  data.tar.gz: f0d4753ee43cb205fa86468dad92a66644e12cf889d8018283cb421e4a5d670386b8666af64b89d4d475a59f10701de2223c31d03ac5d366f2ee255c77190cf8
+  metadata.gz: 6f9bf0a17ee3541b0dfc2e296bbb78dcb2c86c821427ffff5b1d6a86b7f1a7df53d428e5fc447a148c561177a495c0a9013cf1ebe18fd074fbc478bf7ad81fec
+  data.tar.gz: 0cdead8fab1925979337d5fa5ee890c42c654006db3aed2274e7a0e4a41cc50e157a346b28cbb2f5ce2dee35876010d503602932addcf06f5409a75b8cb5c81c

data/Makefile

@@ -1,6 +1,7 @@
 all: demo
 
 demo: *.hpp *.cpp Makefile
+	#g++  -Wall -O0 -g -lstdc++ demo.cpp -o demo
 	g++  -Wall -O3 -lstdc++ demo.cpp -o demo
 	
 clean: 

data/README.md

@@ -5,8 +5,14 @@ The fuzziness means that candidate filepaths do not need to include exact match
 
 The library can be applied for UTF-8 data also, although there is a small bias in scoring for multibyte characters.
 
+1. [String similarity calculation](#stringsim)
+2. [Interfaces](#interfaces)
+    1. [Command line](#comm)
+    2. [Ruby](#ruby)
+    3. [C++](#cpp)
 
-## String similarity calculation
+
+## String similarity calculation <a name="stringsim"/>
 
 Once the index has been created, the contents can be searched to find the best matching strings. 
 
@@ -39,7 +45,7 @@ and candidate is "./drivers/char/hw_random/nomadik-rng.c", then scores are calcu
 
 # Interfaces
 
-## Commandline
+## Commandline <a name="comm"/>
 Install instructions (for Ubuntu Linux):
 ```
 apt update
@@ -55,8 +61,15 @@ stridx.rb start -- ~/Documents/ ~/Pictures/
 Add bash keybindings (Ctrl-t):
 ```
 eval "$(stridx.rb bash)"
+
+```
+
+To autostart server, add following line to .bashrc:
+```
+[ ! -f ~/.stridx/sock ] && stridx.rb start -- ~/Documents/ ~/Pictures/
 ```
 
+
 Search by pressing <kbd>ctrl</kbd>+<kbd>t</kbd>.  Keys: <kbd>up</kbd>, <kbd>down</kbd>, select with <kbd>enter</kbd>
 
 ![screencast](https://github.com/SamiSieranoja/stridx/assets/46612258/b2fd4fa2-37ad-4423-bd5f-d54b24ff6df5)
@@ -66,6 +79,7 @@ Stop server:
 ```
 stridx.rb stop
 ```
+In case stop doesn't work, try: `kill $(pgrep -f runserver.rb | tail -n 1)`
 
 Start indexing server (on foreground, to debug):
 ```
@@ -151,7 +165,7 @@ Search time: 0.0488 seconds
 ```
 
 
-## C++
+## C++ <a name="cpp"/>
 See demo.cpp
 ```cpp
 #include "stridx.hpp"

data/demo.cpp

@@ -1,4 +1,6 @@
 
+#include <sys/resource.h>
+
 #include <condition_variable>
 #include <functional>
 #include <iostream>
@@ -46,7 +48,11 @@ int main() {
   std::string fn_filePaths = "flist.txt";
   std::vector<std::string> v_filePaths = readLinesFromFile(fn_filePaths);
 
-	// Launch indexing to be run on background
+  // int* a = new int[10];
+  // delete(a);
+  // delete(a);
+
+  // Launch indexing to be run on background
   cout << "File paths: " << v_filePaths.size() << std::endl;
   cout << "Start indexing in the background" << std::endl;
   auto start = std::chrono::high_resolution_clock::now();
@@ -60,22 +66,33 @@ int main() {
   std::chrono::duration<double, std::milli> duration_launch = idx_time_launch - start;
   cout << "Indexing launch time (seconds): " << duration_launch.count() / 1000 << "\n";
 
-	// Wait until indexing has finished
+  // Wait until indexing has finished
   idx.waitUntilDone();
 
   auto idx_time = std::chrono::high_resolution_clock::now();
   std::chrono::duration<double, std::milli> duration = idx_time - start;
   cout << "Indexing finished time for " << v_filePaths.size()
        << " file paths (seconds): " << duration.count() / 1000 << "\n";
+       
+       
+  cout << "DEBUG" << std::endl;
+	// idx.cm.debug();
+  cout << "END DEBUG" << std::endl;
 
   // Find matching filepaths from the index for the query string "rngnomadriv"
   start = std::chrono::high_resolution_clock::now();
-  std::string query = "rngnomadriv";
+  // std::string query = "rngnomadriv";
+  std::string query = "irqbypass.c";
   for (int i = 0; i < 99; i++) {
-    const vector<pair<float, int>> &results = idx.findSimilar(query, 2);
+    // const vector<pair<float, int>> &results = idx.findSimilar(query, 2);
+    const vector<pair<float, int>> &results = idx.findSim(query);
   }
 
-  const vector<pair<float, int>> &results = idx.findSimilar(query, 2);
+
+  // idx.findSim(query);
+
+  // const vector<pair<float, int>> &results = idx.findSimilar(query, 2);
+  const vector<pair<float, int>> &results = idx.findSim(query);
   auto search_time = std::chrono::high_resolution_clock::now();
   duration = search_time - start;
   cout << "Search time for 100 queries (seconds): " << duration.count() / 1000 << "\n";
@@ -91,6 +108,20 @@ int main() {
     }
   }
 
+    // std::cout << "Size of MyClass: " << sizeof(StrIdx::CharMap) << " bytes" << std::endl;
+    // std::cout << "Size of CharMap3: " << sizeof(StrIdx::CharMap3) << " bytes" << std::endl;
+    std::cout << "Size of CharNode: " << sizeof(StrIdx::CharNode) << " bytes" << std::endl;
+    std::cout << "Size of int: " << sizeof(int) << " bytes" << std::endl;
+
+  struct rusage usage;
+  getrusage(RUSAGE_SELF, &usage);
+  std::cout << "Maximum resident set size: " << usage.ru_maxrss << " kilobytes" << std::endl;
+  std::cout << "Integral shared memory size: " << usage.ru_ixrss << " kilobytes" << std::endl;
+  std::cout << "Integral unshared data size: " << usage.ru_idrss << " kilobytes" << std::endl;
+  std::cout << "Integral unshared stack size: " << usage.ru_isrss << " kilobytes" << std::endl;
+  
+  
+
   return 0;
 }
 

data/exe/stridx.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'fileutils'
 
 $:.unshift File.dirname(__FILE__) + "/.."
 
@@ -12,5 +13,9 @@ elsif ARGV[0] == "bash"
 /
 else
   require "daemons"
-  Daemons.run(File.dirname(__FILE__) + "/../runserver.rb")
+  
+  pid_dir_path = File.expand_path("~/.config/stridx/")
+  FileUtils.mkdir_p(pid_dir_path)
+  Daemons.run(File.dirname(__FILE__) + "/../runserver.rb", 
+  {:dir_mode => :normal, :dir => pid_dir_path })
 end