merge latest lieonn.

Author: bitsofcotton

README.md

@@ -156,4 +156,5 @@ Searching the Internet more...
 2025/09/25 merge latest lieonn.
 2025/10/06 merge latest lieonn.
 2025/11/15 merge latest lieonn.
+2025/11/17 merge latest lieonn.
 

lieonn.hh

@@ -4637,18 +4637,43 @@ template <typename T, int nprogress> static inline SimpleVector<T> pGuarantee(co
   return res[res.size() - 1];
 }
 
+// N.B. pre/post process
+template <typename T> SimpleVector<SimpleVector<T> > preAppend(const SimpleVector<SimpleVector<T> >& in) {
+  SimpleVector<SimpleVector<T> > res(delta<SimpleVector<T> >(unOffsetHalf<T>(in)));
+  for(int i = 0; i < res.size(); i += 2) res[i] = - res[i];
+  return res;
+}
+
+template <typename T> SimpleVector<SimpleVector<T> > postAppend(SimpleVector<SimpleVector<T> > res, const SimpleVector<SimpleVector<T> >& in) {
+  SimpleVector<SimpleVector<T> > w(res.size());
+  for(int i = 0; i < w.size() - 1; i ++) {
+    w[i].resize(res[i].size() * 2);
+    w[i].setVector(0, in[i - (w.size() - 1) + in.size()] - res[i]);
+    w[i].setVector(res[i].size(), res[i]);
+  }
+  w[w.size() - 1].resize(res[res.size() - 1].size() * 2);
+  w[w.size() - 1].O().setVector(res[res.size() - 1].size(), res[res.size() - 1]);
+  for(int i = 1; i < w.size(); i ++) w[i] += w[i - 1];
+  for(int i = 0; i < w.size() - 1; i ++)
+    for(int j = 0; j < res[i].size(); j ++)
+      res[i][j] = (w[i][j] + w[i][w[i].size() / 2 + j]) *
+        w[i][w[i].size() / 2 + j];
+  res[res.size() - 1] = w[w.size() - 1].subVector(res[0].size(), res[0].size());
+  for(int i = 1; i < res.size(); i ++)
+    for(int j = 0; j < res[i].size(); j ++) res[i][j] *= res[i - 1][j];
+  for(int i = 0; i < res.size() - 1; i ++)
+    for(int j = 0; j < res[i].size(); j ++)
+      if(in[i][j] != T(int(0)))
+        res[i][j] /= in[i - (res.size() - 1) + in.size()][j];
+  return res;
+}
+
 // N.B. append pseudo-measureable condition into original input
 //      stream but the predictor isn't depend pseudo-things.
 //      also add whole context length markov feeding.
 //      also this feeds something dense and as a result continuous to predictor.
-template <typename T, int nprogress, bool need_prep> SimpleVector<SimpleVector<T> > pAppendMeasure0(const SimpleVector<SimpleVector<T> >& in0, const int& bits, const string& strloop) {
+template <typename T, int nprogress> SimpleVector<SimpleVector<T> > pAppendMeasure0(const SimpleVector<SimpleVector<T> >& in, const int& bits, const string& strloop) {
   assert(0 < bits);
-  SimpleVector<SimpleVector<T> > in;
-  if(need_prep) {
-    in = delta<SimpleVector<T> >(unOffsetHalf<T>(in0));
-    for(int i = 0; i < in.size(); i += 2) in[i] = - in[i];
-    // N.B. p d | p B in upper layer.
-  } else in = unOffsetHalf<T>(in0);
   pair<SimpleVector<SimpleVector<T> >, T> wp(normalizeS<T>(
     delta<SimpleVector<T> >(delta<SimpleVector<T> >(in)) ));
   SimpleVector<SimpleVector<T> > p(unOffsetHalf<T>(pRS00<T, nprogress>(
@@ -4677,22 +4702,16 @@ template <typename T, int nprogress, bool need_prep> SimpleVector<SimpleVector<T
     SimpleVector<SimpleVector<T> > pp(p.subVector(0, i0 + 1));
     for(int i = 0; i < pp.size(); i ++) pp[i] -= plast;
     for(int i = 1; i < pp.size(); i ++) pp[i] += pp[i - 1];
-    // N.B. somehow, ||in0[i0]|| << ||pp[i0]||
-    res.entity.emplace_back(i0 & 1 || ! need_prep ? move(pp[i0]) : - pp[i0]);
+    // N.B. somehow, ||in[i0]|| << ||pp[i0]||
+    res.entity.emplace_back(i0 & 1 ? move(pp[i0]) : - pp[i0]);
   }
-  if(need_prep) {
-    for(int i = 1; i < res.size(); i ++) res[i] += res[i - 1];
-    for(int i = res.size() - 1; 0 < i; i --)
-      for(int j = 0; j < res[i].size(); j ++)
-        res[i][j] *= res[i - 1][j] * in[i - res.size() + in.size()][j];
-  }
-  // N.B. we need (p B |) p s | p0 0 1 after this line.
   return res;
 }
 
 template <typename T, int nprogress> static inline SimpleVector<T> pAppendMeasure(const SimpleVector<SimpleVector<T> >& in0, const int& bits, const string& strloop) {
-  SimpleVector<SimpleVector<T> > p(
-    pAppendMeasure0<T, nprogress, true>(in0, bits, strloop));
+  SimpleVector<SimpleVector<T> > in(preAppend<T>(in0));
+  SimpleVector<SimpleVector<T> > p(postAppend<T>(
+    pAppendMeasure0<T, nprogress>(in, bits, strloop), in));
   return p[p.size() - 1];
 }
 
@@ -4708,11 +4727,12 @@ template <typename T, int nprogress> static inline SimpleVector<T> pAppendMeasur
 //      however, if the original raw stream have whole vector context each pixel
 //      structure have better structure than PRNGs, it's better bet with the
 //      condition after prediction shrinking.
-template <typename T, int nprogress> SimpleVector<SimpleVector<T> > pPRNG0(const SimpleVector<SimpleVector<T> >& in0, const int& bits, const string& strloop) {
+template <typename T, int nprogress> SimpleVector<SimpleVector<T> > pPRNG0(const SimpleVector<SimpleVector<T> >& in00, const int& bits, const string& strloop) {
   assert(0 < bits);
 #if defined(_OPENMP)
-  for(int i = 1; i <= in0.size(); i ++) pnextcacher<T>(i, 1);
+  for(int i = 1; i <= in00.size(); i ++) pnextcacher<T>(i, 1);
 #endif
+  SimpleVector<SimpleVector<T> > in0(offsetHalf<T>(preAppend<T>(in00)));
   SimpleVector<SimpleVector<T> > in;
   in.entity.reserve(in0.size());
   for(int i = 0; i < in0.size(); i ++) {
@@ -4730,8 +4750,8 @@ template <typename T, int nprogress> SimpleVector<SimpleVector<T> > pPRNG0(const
     in.entity.emplace_back(work);
   }
   if(_P_PRNG_ <= 1) {
-    SimpleVector<SimpleVector<T> > res(offsetHalf<T>(
-      pAppendMeasure0<T, nprogress, true>(in, bits, strloop)) );
+    SimpleVector<SimpleVector<T> > res(offsetHalf<T>(postAppend<T>(
+      pAppendMeasure0<T, nprogress>(in, bits, strloop), in)) );
     for(int i = 0; i < res.size(); i ++)
       res[i] = bitsG<T, true>(res[i], - bits);
     return res;
@@ -4752,22 +4772,35 @@ template <typename T, int nprogress> SimpleVector<SimpleVector<T> > pPRNG0(const
     for(int k = 0; k < work[j].size(); k ++) work[j][k] = offsetHalf<T>(
       prng[j][k] * unOffsetHalf<T>(in[j][k / _P_PRNG_]) );
   }
-  SimpleVector<SimpleVector<T> > w(pAppendMeasure0<T, nprogress, true>(work,
-    bits, strloop));
-  SimpleVector<SimpleVector<T> > out(w.size());
+  SimpleVector<SimpleVector<T> > res(postAppend<T>(
+    pAppendMeasure0<T, nprogress>(work, bits, strloop), work));
+  SimpleVector<SimpleVector<T> > out(res.size());
   for(int i = 0; i < out.size(); i ++) {
     out[i].resize(in[0].size());
     out[i].O();
-    for(int j = 0; j < w[i].size(); j ++)
-      out[i][j / _P_PRNG_] += w[i][j] *
+    for(int j = 0; j < res[i].size(); j ++)
+      out[i][j / _P_PRNG_] += res[i][j] *
         prng[i - out.size() + prng.size()][j];
     out[i] = bitsG<T, true>(offsetHalf<T>(out[i]), - bits);
   }
   return out;
 }
 
+template <typename T, int nprogress> SimpleVector<SimpleVector<T> > pPRNG1(const SimpleVector<SimpleVector<T> >& in, const int& bits, const string& strloop) {
+  SimpleVector<SimpleVector<T> > p(delta<SimpleVector<T> >(unOffsetHalf<T>(
+    pPRNG0<T, nprogress>(in, bits, string("+") + strloop))));
+  for(int i = 0; i < p.size(); i += 2) p[i] = - p[i];
+  for(int i = 1; i < p.size(); i ++) p[i] += p[i - 1];
+  p = delta<SimpleVector<T> >(unOffsetHalf<T>(pPRNG0<T, nprogress>(
+    offsetHalf<T>(p), bits, string("-") + strloop)));
+  p.resize(p.size() - 1);
+  for(int i = 0; i < p.size(); i += 2) p[i] = - p[i];
+  for(int i = 1; i < p.size(); i ++) p[i] += p[i - 1];
+  return p;
+}
+
 template <typename T, int nprogress> static inline SimpleVector<T> pPRNG(const SimpleVector<SimpleVector<T> >& in0, const int& bits, const string& strloop) {
-  SimpleVector<SimpleVector<T> > p(pPRNG0<T, nprogress>(in0, bits, strloop));
+  SimpleVector<SimpleVector<T> > p(pPRNG1<T, nprogress>(in0, bits, strloop));
   return p[p.size() - 1];
 }