Skip to content

Commit abe46ae

Browse files
lemirelemire
committed
more pedantic fixes
1 parent b0309cb commit abe46ae

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

‎src/codecs.cpp‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ int main(int argc, char **argv) {
154154
const uint32_t N = 4194304 * 16;
155155
vector<vector<uint32_t, cacheallocator>> datas;
156156
cout << "# zipfian 1 data generation..." << endl;
157-
for (uint32_t k = 0; k < (1U << 1); ++k)
158-
datas.push_back(generateZipfianArray32(N, 1.0, 1U << 20));
157+
for (uint32_t k = 0; k < (1ULL << 1); ++k)
158+
datas.push_back(generateZipfianArray32(N, 1.0, 1ULL << 20));
159159
if (splitlongarrays)
160160
splitLongArrays(datas);
161161
processparameters pp(false, fulldisplay, displayhistogram,
@@ -166,9 +166,9 @@ int main(int argc, char **argv) {
166166
} else if (strcmp(parameter, "zipfian2") == 0) {
167167
const uint32_t N = 4194304 * 16;
168168
vector<vector<uint32_t, cacheallocator>> datas;
169-
for (uint32_t k = 0; k < (1U << 1); ++k)
169+
for (uint32_t k = 0; k < (1ULL << 1); ++k)
170170
cout << "# zipfian 2 data generation..." << endl;
171-
datas.push_back(generateZipfianArray32(N, 2.0, 1U << 20));
171+
datas.push_back(generateZipfianArray32(N, 2.0, 1ULL << 20));
172172
if (splitlongarrays)
173173
splitLongArrays(datas);
174174
processparameters pp(false, fulldisplay, displayhistogram,
@@ -180,8 +180,8 @@ int main(int argc, char **argv) {
180180
cout << "# dense uniform data generation..." << endl;
181181
vector<vector<uint32_t, cacheallocator>> datas;
182182
UniformDataGenerator clu;
183-
for (uint32_t k = 0; k < (1U << 5); ++k)
184-
datas.push_back(clu.generateUniform((1U << 18), 1U << 27));
183+
for (uint32_t k = 0; k < (1ULL << 5); ++k)
184+
datas.push_back(clu.generateUniform((1ULL << 18), 1ULL << 27));
185185
cout << "# generated " << datas.size() << " arrays" << endl;
186186
if (splitlongarrays)
187187
splitLongArrays(datas);
@@ -194,9 +194,9 @@ int main(int argc, char **argv) {
194194
cout << "# sparse uniform data generation..." << endl;
195195
vector<vector<uint32_t, cacheallocator>> datas;
196196
UniformDataGenerator clu;
197-
for (uint32_t k = 0; k < (1U << 14);
198-
++k) // by original paper should be 1U<<19
199-
datas.push_back(clu.generateUniform((1U << 9), 1U << 27));
197+
for (uint32_t k = 0; k < (1ULL << 14);
198+
++k) // by original paper should be 1ULL<<19
199+
datas.push_back(clu.generateUniform((1ULL << 9), 1ULL << 27));
200200
cout << "# generated " << datas.size() << " arrays" << endl;
201201
if (splitlongarrays)
202202
splitLongArrays(datas);
@@ -209,9 +209,9 @@ int main(int argc, char **argv) {
209209
cout << "# dense cluster data generation..." << endl;
210210
vector<vector<uint32_t, cacheallocator>> datas;
211211
ClusteredDataGenerator clu;
212-
for (uint32_t k = 0; k < (1U << 5);
213-
++k) // by original paper should be 1U<<10
214-
datas.push_back(clu.generateClustered((1U << 18), 1U << 27));
212+
for (uint32_t k = 0; k < (1ULL << 5);
213+
++k) // by original paper should be 1ULL<<10
214+
datas.push_back(clu.generateClustered((1ULL << 18), 1ULL << 27));
215215
cout << "# generated " << datas.size() << " arrays" << endl;
216216
if (splitlongarrays)
217217
splitLongArrays(datas);
@@ -224,9 +224,9 @@ int main(int argc, char **argv) {
224224
cout << "# sparse cluster data generation..." << endl;
225225
vector<vector<uint32_t, cacheallocator>> datas;
226226
ClusteredDataGenerator clu;
227-
for (uint32_t k = 0; k < (1U << 14);
228-
++k) // by original paper should be 1U<<19
229-
datas.push_back(clu.generateClustered((1U << 9), 1U << 27));
227+
for (uint32_t k = 0; k < (1ULL << 14);
228+
++k) // by original paper should be 1ULL<<19
229+
datas.push_back(clu.generateClustered((1ULL << 9), 1ULL << 27));
230230
cout << "# generated " << datas.size() << " arrays" << endl;
231231
if (splitlongarrays)
232232
splitLongArrays(datas);
@@ -239,9 +239,9 @@ int main(int argc, char **argv) {
239239
cout << "# dense uniform data generation..." << endl;
240240
vector<vector<uint32_t, cacheallocator>> datas;
241241
UniformDataGenerator clu;
242-
for (uint32_t k = 0; k < (1U << 3);
243-
++k) // by original paper should be 1U<<10
244-
datas.push_back(clu.generateUniform((1U << 22), 1U << 29));
242+
for (uint32_t k = 0; k < (1ULL << 3);
243+
++k) // by original paper should be 1ULL<<10
244+
datas.push_back(clu.generateUniform((1ULL << 22), 1ULL << 29));
245245
cout << "# generated " << datas.size() << " arrays" << endl;
246246
if (splitlongarrays)
247247
splitLongArrays(datas);
@@ -254,8 +254,8 @@ int main(int argc, char **argv) {
254254
cout << "# sparse uniform data generation..." << endl;
255255
vector<vector<uint32_t, cacheallocator>> datas;
256256
UniformDataGenerator clu;
257-
for (uint32_t k = 0; k < (1U << 13); ++k)
258-
datas.push_back(clu.generateUniform((1U << 12), 1U << 29));
257+
for (uint32_t k = 0; k < (1ULL << 13); ++k)
258+
datas.push_back(clu.generateUniform((1ULL << 12), 1ULL << 29));
259259
cout << "# generated " << datas.size() << " arrays" << endl;
260260
if (splitlongarrays)
261261
splitLongArrays(datas);
@@ -269,7 +269,7 @@ int main(int argc, char **argv) {
269269
vector<vector<uint32_t, cacheallocator>> datas;
270270
ClusteredDataGenerator clu;
271271
for (uint32_t k = 0; k < 1; ++k)
272-
datas.push_back(clu.generateClustered((1U << 23), 1U << 26));
272+
datas.push_back(clu.generateClustered((1ULL << 23), 1ULL << 26));
273273
cout << "# generated " << datas.size() << " arrays" << endl;
274274
if (splitlongarrays)
275275
splitLongArrays(datas);
@@ -282,8 +282,8 @@ int main(int argc, char **argv) {
282282
cout << "# sparse cluster data generation..." << endl;
283283
vector<vector<uint32_t, cacheallocator>> datas;
284284
ClusteredDataGenerator clu;
285-
for (uint32_t k = 0; k < (1U << 13); ++k)
286-
datas.push_back(clu.generateClustered((1U << 12), 1U << 26));
285+
for (uint32_t k = 0; k < (1ULL << 13); ++k)
286+
datas.push_back(clu.generateClustered((1ULL << 12), 1ULL << 26));
287287
cout << "# generated " << datas.size() << " arrays" << endl;
288288
if (splitlongarrays)
289289
splitLongArrays(datas);
@@ -297,10 +297,10 @@ int main(int argc, char **argv) {
297297
ClusteredDataGenerator clu;
298298
for (uint32_t K = 15; K <= 25; K += 5) {
299299
vector<vector<uint32_t, cacheallocator>> datas;
300-
for (uint32_t k = 0; k < (1U << (25 - K)); ++k)
301-
datas.push_back(clu.generateClustered((1U << K), 1U << 29));
300+
for (uint32_t k = 0; k < (1ULL << (25 - K)); ++k)
301+
datas.push_back(clu.generateClustered((1ULL << K), 1ULL << 29));
302302
cout << "# generated " << datas.size() << " arrays" << endl;
303-
cout << "# their size is " << (1U << K) << endl;
303+
cout << "# their size is " << (1ULL << K) << endl;
304304
const uint32_t p = 29 - K;
305305
if (splitlongarrays)
306306
splitLongArrays(datas);
@@ -315,10 +315,10 @@ int main(int argc, char **argv) {
315315
UniformDataGenerator clu;
316316
for (uint32_t K = 15; K <= 25; K += 5) {
317317
vector<vector<uint32_t, cacheallocator>> datas;
318-
for (uint32_t k = 0; k < (1U << (25 - K)); ++k)
319-
datas.push_back(clu.generateUniform((1U << K), 1U << 29));
318+
for (uint32_t k = 0; k < (1ULL << (25 - K)); ++k)
319+
datas.push_back(clu.generateUniform((1ULL << K), 1ULL << 29));
320320
cout << "# generated " << datas.size() << " arrays" << endl;
321-
cout << "# their size is " << (1U << K) << endl;
321+
cout << "# their size is " << (1ULL << K) << endl;
322322
const uint32_t p = 29 - K;
323323
if (splitlongarrays)
324324
splitLongArrays(datas);
@@ -333,10 +333,10 @@ int main(int argc, char **argv) {
333333
ClusteredDataGenerator clu;
334334
for (uint32_t K = 15; K <= 20; K += 5) {
335335
vector<vector<uint32_t, cacheallocator>> datas;
336-
for (size_t k = 0; k < static_cast<size_t>(1U << (20 - K)); ++k)
337-
datas.push_back(clu.generateClustered((1U << K), 1U << 29));
336+
for (size_t k = 0; k < static_cast<size_t>(1ULL << (20 - K)); ++k)
337+
datas.push_back(clu.generateClustered((1ULL << K), 1ULL << 29));
338338
cout << "# generated " << datas.size() << " arrays" << endl;
339-
cout << "# their size is " << (1U << K) << endl;
339+
cout << "# their size is " << (1ULL << K) << endl;
340340
const uint32_t p = 29 - K;
341341
if (splitlongarrays)
342342
splitLongArrays(datas);
@@ -351,10 +351,10 @@ int main(int argc, char **argv) {
351351
UniformDataGenerator clu;
352352
for (uint32_t K = 15; K <= 20; K += 5) {
353353
vector<vector<uint32_t, cacheallocator>> datas;
354-
for (size_t k = 0; k < static_cast<size_t>(1U << (20 - K)); ++k)
355-
datas.push_back(clu.generateUniform((1U << K), 1U << 29));
354+
for (size_t k = 0; k < static_cast<size_t>(1ULL << (20 - K)); ++k)
355+
datas.push_back(clu.generateUniform((1ULL << K), 1ULL << 29));
356356
cout << "# generated " << datas.size() << " arrays" << endl;
357-
cout << "# their size is " << (1U << K) << endl;
357+
cout << "# their size is " << (1ULL << K) << endl;
358358
const uint32_t p = 29 - K;
359359
if (splitlongarrays)
360360
splitLongArrays(datas);
@@ -369,12 +369,12 @@ int main(int argc, char **argv) {
369369
ClusteredDataGenerator clu;
370370
for (uint32_t K = 15; K <= 25; K += 5) {
371371
vector<vector<uint32_t, cacheallocator>> datas;
372-
for (size_t k = 0; k < static_cast<size_t>(1U << (25 - K)); ++k)
372+
for (size_t k = 0; k < static_cast<size_t>(1ULL << (25 - K)); ++k)
373373
datas.push_back(
374-
diffs(clu.generateClustered((1U << K), 1U << 29), false));
374+
diffs(clu.generateClustered((1ULL << K), 1ULL << 29), false));
375375
cout << "# generated " << datas.size()
376376
<< " arrays and applied delta coding" << endl;
377-
cout << "# their size is " << (1U << K) << endl;
377+
cout << "# their size is " << (1ULL << K) << endl;
378378
const uint32_t p = 29 - K;
379379
if (splitlongarrays)
380380
splitLongArrays(datas);
@@ -389,12 +389,12 @@ int main(int argc, char **argv) {
389389
UniformDataGenerator clu;
390390
for (uint32_t K = 15; K <= 25; K += 5) {
391391
vector<vector<uint32_t, cacheallocator>> datas;
392-
for (size_t k = 0; k < static_cast<size_t>(1U << (25 - K)); ++k)
392+
for (size_t k = 0; k < static_cast<size_t>(1ULL << (25 - K)); ++k)
393393
datas.push_back(
394-
diffs(clu.generateUniform((1U << K), 1U << 29), false));
394+
diffs(clu.generateUniform((1ULL << K), 1ULL << 29), false));
395395
cout << "# generated " << datas.size()
396396
<< " arrays and applied delta coding" << endl;
397-
cout << "# their size is " << (1U << K) << endl;
397+
cout << "# their size is " << (1ULL << K) << endl;
398398
const uint32_t p = 29 - K;
399399
if (splitlongarrays)
400400
splitLongArrays(datas);

0 commit comments

Comments
 (0)