Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2ead934

Browse files
Now we have plain Lottery, and Lottery for Recustion objects
1 parent97772cd commit2ead934

File tree

3 files changed

+49
-10
lines changed

3 files changed

+49
-10
lines changed

‎blobstamper/stamp_lottery.h

Lines changed: 45 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/******************************************************************************
2+
*
3+
* Copyright 2021 Nikolay Shaplov (Postgres Professional)
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*
17+
******************************************************************************/
18+
119
template<classStampT>classStampLottery:publicStampT
220
{
321
protected:
@@ -15,15 +33,39 @@ template<class StampT> class StampLottery: public StampT
1533
oracle_size(init_oracle_size(stamps_arg)),
1634
stored_min(init_stored_min(stamps_arg)),
1735
stored_max(init_stored_max(stamps_arg)) {};
18-
StampLottery(): stored_min(-1), stored_max(-2) {};
36+
StampLottery(): stored_min(-1), stored_max(-2), oracle_size(1) {};
1937

2038
virtualintminSize()override;
2139
virtualintmaxSize()override;
40+
41+
virtualboolsoft_maxsize_filter(StampT &stamp,int data_size) {returntrue;};/* Allow to skip stamps that would leave to much data unused. But not active here*/
42+
2243
virtual std::stringExtractStr(Blob &blob)override;
2344
voidAppend(StampT & stamp);
2445
};
2546

2647

48+
template<classStampT>classStampLottery4Recursion:publicStampLottery<StampT>
49+
{
50+
public:
51+
StampLottery4Recursion(std::ref_vector<StampT> stamps_arg): StampLottery<StampT>(stamps_arg) {};
52+
StampLottery4Recursion(): StampLottery<StampT>() {};
53+
virtualboolsoft_maxsize_filter(StampT &stamp,int data_size)override;
54+
};
55+
56+
57+
template<classStampT>bool
58+
StampLottery4Recursion<StampT>::
59+
soft_maxsize_filter(StampT &stamp,int data_size)
60+
{
61+
if ( stamp.isUnbounded() ||// Unbounded is always ok
62+
stamp.maxSize() > data_size ||// Variated that can consume all data is ok
63+
stamp.minSize() + stamp.maxSize() > data_size// Fixed or variated stamp that lefts less data then it's min size will also do
64+
)
65+
returntrue;
66+
returnfalse;
67+
}
68+
2769
template<classStampT>int
2870
StampLottery<StampT>::
2971
init_stored_min(std::ref_vector<StampT> stamps_arg)
@@ -136,14 +178,9 @@ StampLottery<StampT>::ExtractStr(Blob &blob)
136178
for(StampT & stamp : stamps)
137179
{
138180
if(blob.Size() < stamp.minSize())// Skip all stamps that dose not fit
139-
continue;
140-
if ( stamp.isUnbounded() ||// Unbounded is always ok
141-
stamp.maxSize() > blob.Size() ||// Variated that can consume all data is ok
142-
stamp.minSize() *2 > blob.Size()// Fixed or variated stamp that lefts less data then it's min size will also do
143-
)
144-
{
181+
continue;
182+
if (soft_maxsize_filter(stamp, blob.Size()))
145183
actual_stamps.push_back(stamp);
146-
}
147184
}
148185
if (actual_stamps.empty())
149186
{

‎examples/exampleZZ.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ class BinaryOp: public StampBaseStr, public GalleySetBase
2121
op_name(arg_op_name),
2222
stamp1(arg_stamp1),
2323
stamp2(arg_stamp2) {};
24+
25+
virtualintmaxSize()override {return -1;};
26+
2427
};
2528

2629
std::string
@@ -54,7 +57,7 @@ char data[] =
5457
DictLCAlphaSmall dict;
5558
StampDictstamp_dict(dict);
5659

57-
StampLottery<StampBaseStr>stamp_lot({stampс, stamp_dict});
60+
StampLottery4Recursion<StampBaseStr>stamp_lot({stampс, stamp_dict});
5861

5962
for(std::string op_name : ops)
6063
{

‎t/130-stamp_enumerator.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
usingnamespaceTAP;
3232

33-
/* Test that dict works as expected*/
3433
unsignedchar sample[]={1,63,64,255};
3534

3635
int

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp