Version 1.0

Author: schiffma

Diff for: distlib.sqbpro

@@ -21,29 +21,42 @@ select lcseql('cärpenter', 'shärpener');
 
 select * from subseq('ABC');
 
+WITH orig_ AS (SELECT 'Z''Hansrüed' AS orig),
+perm_ AS (SELECT orig, permut FROM perm(orig) JOIN orig_ ON 1=1)
+SELECT * FROM perm_;
+
 DROP TABLE IF EXISTS perm_gen;
 CREATE TABLE IF NOT EXISTS perm_gen AS
 WITH orig_ AS (SELECT 'Gerät' AS orig), 
 perm_ AS (SELECT orig, permut FROM perm(orig) JOIN orig_ ON 1=1)
 SELECT * FROM perm_;
 
+WITH orig_ AS (SELECT 'Geräte' AS orig), 
+perm_ AS (SELECT orig, permut FROM perm(orig) JOIN orig_ ON 1=1)
+SELECT * FROM (
+SELECT orig, permut, orig||permut test1, lcstr(orig, permut) lcstr, lcstrl(orig, permut) lcstrl, 
+lcseq(orig, permut) lcseq, lcseql(orig, permut) lcseql FROM perm_
+) WHERE permut = 'tGeäer';
+;
+select lcstr('Geräte','tGeäer');
+
 --CREATE TABLE IF NOT EXISTS perm_test AS
 --WITH orig_ AS (SELECT 'Z''Hansrüedi' AS orig), 
 --perm_ AS (SELECT orig, permut FROM perm(orig) JOIN orig_ ON 1=1)
---SELECT * FROM perm_;
-
---SELECT orig, permut, lcstr(orig, permut) lcstr
---,lcseq(orig, permut) lcseq 
+--SELECT * FROM perm_;
+
+--SELECT orig, permut, lcstr(orig, permut) lcstr
+--,lcseq(orig, permut) lcseq 
 --FROM perm_gen; 
-
+
 DROP TABLE IF EXISTS perm_test;
 CREATE TABLE IF NOT EXISTS perm_test AS
-SELECT orig, permut, lcstr(orig, permut) lcstr, lcseq(orig, permut) lcseq , 
+SELECT orig, permut, lcstr(orig, permut) lcstr, lcseq(orig, permut) lcseq , 
 lcstrl(orig, permut) lcstrl, lcseql(orig, permut) lcseql, lsim(orig, permut) lsim, 
 dlsim(orig, permut) dlsim, jsim(orig, permut) jsim, jwsim(orig, permut) jwsim FROM perm_gen
 ;
-
---SELECT * FROM perm_test;
+
+--SELECT * FROM perm_test;
 
 DROP TABLE IF EXISTS subseq_gen;
 CREATE TABLE IF NOT EXISTS subseq_gen AS

Diff for: distlib_64.dll

@@ -11,15 +11,15 @@ using std::string;
 using std::vector;
 using std::max;
 
-// Function to find longest common subsequence.
+// Function to find longest common substring.
 string lcstr(const string &str1, const string &str2)
 {
-    if (str1 == "" || str2 == "")
-        return "";	
-    structRet ret;
-	ret = lcs2_length_(str1, str2);
-    vector<string> str1v = utf8_split(str1);
-	return vect2str(slice(str1v, ret.start, ret.start + ret.max - 1));
+   if (str1 == "" || str2 == "")
+      return "";	
+   structRet ret;
+   ret = lcs2_length_(str1, str2);
+   vector<string> str1v = utf8_split(str1);
+   return vect2str(slice(str1v, ret.start, ret.start + ret.max - 1));
 }
 
 

Diff for: lcsubstr.cpp

@@ -72,8 +72,7 @@ struct perm_cursor {
   sqlite3_int64 iRowid;      /* The rowid */
   string    perm;
   sqlite3_int64  nrows;
-  vector<string>    permv;  
-  vector<string>::iterator it;   
+  vector<string>    permv;   
 };
 
 
@@ -140,7 +139,8 @@ int permClose(sqlite3_vtab_cursor *cur){
 int permNext(sqlite3_vtab_cursor *cur){
   perm_cursor *pCur = (perm_cursor*)cur;
   pCur->iRowid++;
-  pCur->it++;
+  //pCur->it++;
+  next_permutation(pCur->permv.begin(), pCur->permv.end()); 
   return SQLITE_OK;
 }
 
@@ -154,10 +154,7 @@ int permColumn(
   int i                       /* Which column to return */
 ){
   perm_cursor *pCur = (perm_cursor*)cur;
-  if (i==0) { // only one column to return
-     if (pCur->iRowid > 0 ){
-	   next_permutation(pCur->permv.begin(), pCur->permv.end());     
-     }   
+  if (i==0) { // only one column to return  
 	pCur->perm = vect2str(pCur->permv);
     sqlite3_result_text(ctx, pCur->perm.c_str(), pCur->perm.size(),0);
   }
@@ -208,8 +205,7 @@ int permFilter(
   if(l>0 && l <= max_len)
   {
 	pCur->permv = utf8_split(s);
-    sort(pCur->permv.begin(), pCur->permv.end()); // initial sorting is important !!!	
-	pCur->it = pCur->permv.begin();	  
+    sort(pCur->permv.begin(), pCur->permv.end()); // initial sorting is important !!!		  
 	pCur->perm  = vect2str(pCur->permv);	
 	pCur->nrows = (l  > 0) ? factorial(l) : 0;
     pCur->iRowid = 0;	

Diff for: perm.cpp

@@ -1,11 +1,11 @@
-// https://github.com/Meteorix/pylcs
+// L. Schiffmann, July 2021
 
 #ifndef PYLCS_HPP
 #define PYLCS_HPP
 
 #include <string>
 
-// L. Schiffmann
+// L. Schiffmann, July 2021
 // struct for max length and start position
 
 struct structRet {