Move Oracle related things to separate file

Author: nataraj-hates-MS-for-stealing-github

blobstamper/galley.cpp

@@ -24,7 +24,7 @@
 #include "stamp.h"
 #include "stamp_arithm.h"
 #include "galley.h"
-
+#include "oracle.h"
 
 int
 GalleyVectorBase::minSize()

blobstamper/galley.h

@@ -19,20 +19,13 @@
 #ifndef GALLEY_H
 #define GALLEY_H
 
-
-#include <limits>
 #include <vector>
 #include <functional> // for std::reference_wrapper
 
 #include "stamp.h"
 #include "blob.h"
 
 
-#define ORACLE_TYPE unsigned short int
-#define ORACLE_STAMP StampArithm<ORACLE_TYPE>
-#define ORACLE_SIZE sizeof(ORACLE_TYPE)
-#define ORACLE_MAX std::numeric_limits<ORACLE_TYPE>::max()
-
 class GalleyBase: public virtual StampBase
 /* Galley is a kind of stamp, somwhere deep inside. */
 /* You can inherit it, and make a stamp out of it*/
@@ -63,7 +56,6 @@ template<class T> class GalleyVectorStrStampBase:  public GalleyVectorStr, publi
 {
   public:
     GalleyVectorStrStampBase(): GalleyVectorStr(std::make_shared<T>()) {};
-
 };
 
 

blobstamper/oracle.cpp

@@ -0,0 +1,37 @@
+/******************************************************************************
+ *
+ * Copyright 2021-2023 Nikolay Shaplov (Postgres Professional)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ******************************************************************************/
+
+#include <math.h>
+
+#include"oracle.h"
+
+size_t
+OracleProportion(ORACLE_TYPE oracle, size_t min, size_t max)
+{
+  /* Sorry explanation is in Russian. PR translation if you can */
+  /* Считаем пропорацию, с округлением вниз.
+   * Диапазон увиличиваем на единицу, чтобы хвост диапазона пресказания при
+   * округлении вниз как раз попадал в последний элемент целевого диапозона.
+   * Разброс предсказания увеличиваем на единицу, так чтобы ровно на конец
+   * хвоста диапазона предсказания не попасть никогда и тогда он не округлиться 
+   * в max + 1*/
+  size_t delta = max - min + 1;
+  size_t res = floor(((float) oracle) / ((float) ORACLE_MAX + 1) * delta );
+  return min + res;
+}
+

blobstamper/oracle.h

@@ -0,0 +1,33 @@
+/******************************************************************************
+ *
+ * Copyright 2021-2023 Nikolay Shaplov (Postgres Professional)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ******************************************************************************/
+
+#ifndef STAMP_ORACLE_H
+#define STAMP_ORACLE_H
+
+#include <cstddef>
+#include <limits>
+
+#define ORACLE_TYPE unsigned short int
+#define ORACLE_STAMP StampArithm<ORACLE_TYPE>
+#define ORACLE_SIZE sizeof(ORACLE_TYPE)
+#define ORACLE_MAX std::numeric_limits<ORACLE_TYPE>::max()
+
+size_t OracleProportion(ORACLE_TYPE oracle, size_t min, size_t max);
+
+#endif  /* STAMP_ORACLE_H */
+

t/300-galley.cpp

@@ -26,6 +26,7 @@
 #include <tap++/tap++.h>
 
 #include "blobstamper/blobstamper.h"
+#include "blobstamper/oracle.h"
 
 #include "test-chars-stamps.h"
 

t/321-galley-recursion-experiments_2.cpp

@@ -28,6 +28,7 @@
 
 #include "blobstamper/blobstamper.h"
 #include "blobstamper/dict.h"
+#include "blobstamper/oracle.h"
 
 #include "test-chars-stamps.h"
 
@@ -44,20 +45,6 @@ unsigned char bin_sample[]= {49, 22, 152, 226, 89, 119, 247, 115, 43, 42, 243, 7
 //class TestRNode2;
 //class TestRNode3;
 
-size_t
-Proportion(ORACLE_TYPE oracle, size_t min, size_t max)
-{
-  /* Sorry explanation is in Russian. PR translation if you can */
-  /* Считаем пропорацию, с округлением вниз.
-   * Диапазон увиличиваем на единицу, чтобы хвост диапазона пресказания при
-   * округлении вниз как раз попадал в последний элемент целевого диапозона.
-   * Разброс предсказания увеличиваем на единицу, так чтобы ровно на конец
-   * хвоста диапазона предсказания не попасть никогда и тогда он не округлиться 
-   * в max + 1*/
-  size_t delta = max - min + 1;
-  size_t res = floor(((float) oracle) / ((float) ORACLE_MAX + 1) * delta );
-  return min + res;
-}
 
 class PoolPickerStamp : public virtual StampBaseStr
 {
@@ -122,7 +109,7 @@ fprintf(stderr, "*");
     }
   }
 
-  size_t index = Proportion(oracle, 0, target_pool.size() - 1);
+  size_t index = OracleProportion(oracle, 0, target_pool.size() - 1);
   return target_pool[index].lock()->ExtractStr(blob);
 }
 
@@ -243,12 +230,12 @@ main()
 
     TEST_START(6);
     {
-       is(Proportion(0,0,255), 0);
-       is(Proportion(255,0,255), 0);
-       is(Proportion(256,0,255), 1);
-       is(Proportion(65535,0,255), 255);
-       is(Proportion(65535-255,0,255), 255);
-       is(Proportion(65535-256,0,255), 254);
+       is(OracleProportion(0,0,255), 0);
+       is(OracleProportion(255,0,255), 0);
+       is(OracleProportion(256,0,255), 1);
+       is(OracleProportion(65535,0,255), 255);
+       is(OracleProportion(65535-255,0,255), 255);
+       is(OracleProportion(65535-256,0,255), 254);
 
     }
     TEST_END;