isomorfeus-ferret 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 535294842e0ed4157e7148a2876c824364d4f7bff1538192088013420f6667a4
-  data.tar.gz: 7ddc0f033782863e57b2b4f316f63f313365a117203b991b4f85d151cc3e479b
+  metadata.gz: 6fced309c17056d92c0613d5c7cb6ad3c67b894abb4be9b51265c29e19774ef5
+  data.tar.gz: cea4228781c82c24dfc4c1e65f308819cca0c5528078496f1859f0ea89cf0a70
 SHA512:
-  metadata.gz: 31daaa79fbe048c238b3f3b4141885ac2cefb5e61a9d2a79e1b327341d2d5ea6bed6037da256563f29440a0d4d7d05e553dc83184e6ef46a0fab87a90c4b6905
-  data.tar.gz: b1f48f41d0e9e100202c1a8c1a2cbeffcfb5040b62c992d33c8994634f4adfff6caeb66c1ed82e6e5f34101a4b6446b4e034d2372e3a211cd2de9a9d7df62697
+  metadata.gz: '09d9e4ff1377d72fabd563580b313a0faa09da26bd5acfd16463cc2cedb07599d41888908b16fd03fec7e4558c0c1faa5caa4567c42e4a816878f6bc853be92f'
+  data.tar.gz: 0e84afbe9a46912dc56d66c9af9d8c9893cb55867f913a2e19ff98f2ba36989302eb3243c8fb79245a3f0a793ae39ed4fc4cc46531dfa7bd20ed9e7378c1a0ba

data/ext/isomorfeus_ferret_ext/frt_q_phrase.c

@@ -86,8 +86,7 @@ static bool pp_next_position(PhPos *self)
     if (self->count >= 0) {         /* read subsequent pos's */
         self->position = tpe->next_position(tpe) - self->offset;
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
@@ -106,7 +105,7 @@ static int pp_cmp(const void *const p1, const void *const p2)
     if (cmp == 0) {
         cmp = PP_pp(p1)->position - PP_pp(p2)->position;
         if (cmp == 0) {
-            cmp = PP_pp(p1)->offset - PP_pp(p2)->offset;
+            return PP_pp(p1)->offset - PP_pp(p2)->offset;
         }
     }
     return cmp;
@@ -121,8 +120,7 @@ static bool pp_less_than(const PhPos *pp1, const PhPos *pp2)
 {
     if (pp1->position == pp2->position) {
         return pp1->offset < pp2->offset;
-    }
-    else {
+    } else {
         return pp1->position < pp2->position;
     }
 }
@@ -456,7 +454,7 @@ static float sphsc_phrase_freq(FrtScorer *self)
         res = pp_first_position(pp);
         assert(res);(void)res;
         if (check_repeats && (i > 0)) {
-            if (!sphsc_check_repeats(pp, phsc->phrase_pos, i)) {
+            if (!sphsc_check_repeats(pp, phsc->phrase_pos, i - 1)) {
                 goto return_freq;
             }
         }
@@ -465,9 +463,8 @@ static float sphsc_phrase_freq(FrtScorer *self)
         }
         frt_pq_push(pq, pp);
     }
-    int pqsize = pq->size;
+
     do {
-        pqsize--;
         pp = (PhPos *)frt_pq_pop(pq);
         pos = start = pp->position;
         next_pos = PP(frt_pq_top(pq))->position;
@@ -488,8 +485,8 @@ static float sphsc_phrase_freq(FrtScorer *self)
             last_pos = pp->position;
         }
         frt_pq_push(pq, pp);        /* restore pq */
-        if (pqsize == 0) { done = true; }
     } while (!done);
+
 return_freq:
     frt_pq_destroy(pq);
     return freq;

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.12.5'
+    VERSION = '0.12.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake