176c176
< virtual size_t size() const = 0;
---
> virtual size_type size() const = 0;
185c185
< int s = size();
---
> size_type s = size();
210c210
< virtual size_t size() const { return s.size(); }
---
> virtual size_type size() const { return s.size(); }
251c251
< int size;
---
> size_type size;
293c293
< virtual size_t size() const = 0;
---
> virtual size_type size() const = 0;
298c298
< int s = size();
---
> size_type s = size();
318c318
< virtual size_t size() const { return s.size(); }
---
> virtual size_type size() const { return s.size(); }
339,340c339,340
< mutable int x;
< mutable int y;
---
> mutable size_type x;
> mutable size_type y;
509c509
< subname(int index, const std::string &name)
---
> subname(off_type index, const std::string &name)
526c526
< subdesc(int index, const std::string &desc)
---
> subdesc(off_type index, const std::string &desc)
551c551
< for (int i = 0; i < this->y; ++i)
---
> for (off_type i = 0; i < this->y; ++i)
557c557
< ysubname(int index, const std::string subname)
---
> ysubname(off_type index, const std::string subname)
835c835
< size_t size() const { return 1; }
---
> size_type size() const { return 1; }
859c859
< virtual size_t size() const { return 1; }
---
> virtual size_type size() const { return 1; }
919c919
< size_t size() const { return proxy->size(); }
---
> size_type size() const { return proxy->size(); }
945c945
< int index;
---
> off_type index;
966c966
< ScalarProxy(Stat *s, int i)
---
> ScalarProxy(Stat *s, off_type i)
1050c1050
< size_t size() const { return 1; }
---
> size_type size() const { return 1; }
1086c1086
< size_t _size;
---
> size_type _size;
1097c1097
< Storage *data(int index) { return &storage[index]; }
---
> Storage *data(off_type index) { return &storage[index]; }
1104c1104
< const Storage *data(int index) const { return &storage[index]; }
---
> const Storage *data(off_type index) const { return &storage[index]; }
1107c1107
< doInit(int s)
---
> doInit(size_type s)
1116c1116
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1127c1127
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1139c1139
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1151c1151
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1159c1159
< size_t size() const { return _size; }
---
> size_type size() const { return _size; }
1164c1164
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1179c1179
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1193c1193
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1204c1204
< operator[](int index)
---
> operator[](off_type index)
1218,1219c1218,1219
< int offset;
< int len;
---
> off_type offset;
> size_type len;
1225c1225
< data(int index)
---
> data(off_type index)
1232c1232
< data(int index) const
---
> data(off_type index) const
1244c1244
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1254c1254
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1260c1260
< VectorProxy(Stat *s, int o, int l)
---
> VectorProxy(Stat *s, off_type o, size_type l)
1280c1280
< operator[](int index)
---
> operator[](off_type index)
1286c1286
< size_t size() const { return len; }
---
> size_type size() const { return len; }
1305,1307c1305,1307
< size_t x;
< size_t y;
< size_t _size;
---
> size_type x;
> size_type y;
> size_type _size;
1312,1313c1312,1313
< Storage *data(int index) { return &storage[index]; }
< const Storage *data(int index) const { return &storage[index]; }
---
> Storage *data(off_type index) { return &storage[index]; }
> const Storage *data(off_type index) const { return &storage[index]; }
1316c1316
< doInit(int _x, int _y)
---
> doInit(size_type _x, size_type _y)
1332c1332
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1348c1348
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1356c1356
< int size = this->size();
---
> size_type size = this->size();
1358c1358
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
1362c1362
< std::string ysubname(int i) const { return (*this->y_subnames)[i]; }
---
> std::string ysubname(off_type i) const { return (*this->y_subnames)[i]; }
1365c1365
< operator[](int index)
---
> operator[](off_type index)
1367c1367
< int offset = index * y;
---
> off_type offset = index * y;
1373c1373
< size_t
---
> size_type
1384c1384
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1397c1397
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1430c1430
< int size;
---
> size_type size;
1473c1473,1474
< size_t index = std::floor((val - params.min) / params.bucket_size);
---
> size_type index =
> (size_type)std::floor((val - params.min) / params.bucket_size);
1495c1496
< size_t size(const Params &) const { return cvec.size(); }
---
> size_type size(const Params &) const { return cvec.size(); }
1521c1522
< for (int i = 0; i < params.size; ++i)
---
> for (off_type i = 0; i < params.size; ++i)
1540,1541c1541,1542
< int size = cvec.size();
< for (int i = 0; i < size; ++i)
---
> size_type size = cvec.size();
> for (off_type i = 0; i < size; ++i)
1608c1609
< size_t size(const Params &) const { return 1; }
---
> size_type size(const Params &) const { return 1; }
1678c1679
< size_t size(const Params ¶ms) const { return 1; }
---
> size_type size(const Params ¶ms) const { return 1; }
1760c1761
< size_t size() const { return data()->size(params); }
---
> size_type size() const { return data()->size(params); }
1804c1805
< size_t _size;
---
> size_type _size;
1809c1810
< data(int index)
---
> data(off_type index)
1815c1816
< data(int index) const
---
> data(off_type index) const
1821c1822
< doInit(int s)
---
> doInit(size_type s)
1830c1831
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1846c1847
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1851c1852
< Proxy operator[](int index);
---
> Proxy operator[](off_type index);
1853c1854
< size_t
---
> size_type
1864c1865
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1877c1878
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1890c1891
< int size = this->size();
---
> size_type size = this->size();
1892c1893
< for (int i = 0; i < size; ++i) {
---
> for (off_type i = 0; i < size; ++i) {
1904c1905
< int index;
---
> off_type index;
1911c1912
< DistProxy(Stat *s, int i)
---
> DistProxy(Stat *s, off_type i)
1935c1936
< size_t
---
> size_type
1955c1956
< VectorDistBase<Storage>::operator[](int index)
---
> VectorDistBase<Storage>::operator[](off_type index)
1964c1965
< VectorDistBase<Storage>::total(int index) const
---
> VectorDistBase<Storage>::total(off_type index) const
1966,1967c1967,1968
< int total = 0;
< for (int i = 0; i < x_size(); ++i)
---
> Result total = 0;
> for (off_type i = 0; i < x_size(); ++i)
1989c1990
< virtual size_t size() const = 0;
---
> virtual size_type size() const = 0;
2028c2029
< virtual size_t size() const { return 1; }
---
> virtual size_type size() const { return 1; }
2061c2062
< virtual size_t
---
> virtual size_type
2087c2088
< virtual size_t size() const { return data->size(); }
---
> virtual size_type size() const { return data->size(); }
2102c2103
< virtual size_t size() const { return 1; }
---
> virtual size_type size() const { return 1; }
2119c2120
< int size = this->size();
---
> size_type size = this->size();
2121c2122
< for (int i = 0; i < size; i++)
---
> for (off_type i = 0; i < size; i++)
2126c2127
< virtual size_t size() const { return vresult.size(); }
---
> virtual size_type size() const { return vresult.size(); }
2130c2131
< int size = this->size();
---
> size_type size = this->size();
2132c2133
< for (int i = 0; i < size; i++)
---
> for (off_type i = 0; i < size; i++)
2192c2193
< int size = lvec.size();
---
> size_type size = lvec.size();
2198c2199
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2209c2210
< for (int i = 0; i < size(); i++)
---
> for (off_type i = 0; i < size(); i++)
2214c2215
< virtual size_t size() const { return l->size(); }
---
> virtual size_type size() const { return l->size(); }
2247c2248
< int size = rvec.size();
---
> size_type size = rvec.size();
2249c2250
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2252c2253
< int size = lvec.size();
---
> size_type size = lvec.size();
2254c2255
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2257c2258
< int size = rvec.size();
---
> size_type size = rvec.size();
2259c2260
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2271c2272
< for (int i = 0; i < size(); i++)
---
> for (off_type i = 0; i < size(); i++)
2276c2277
< virtual size_t
---
> virtual size_type
2279,2280c2280,2281
< int ls = l->size();
< int rs = r->size();
---
> size_type ls = l->size();
> size_type rs = r->size();
2312c2313
< int size = lvec.size();
---
> size_type size = lvec.size();
2318c2319
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2328c2329
< int size = lvec.size();
---
> size_type size = lvec.size();
2334c2335
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2340c2341
< virtual size_t size() const { return 1; }
---
> virtual size_type size() const { return 1; }
2455c2456
< init(size_t size)
---
> init(size_type size)
2477c2478
< init(size_t size)
---
> init(size_type size)
2494c2495
< init(size_t x, size_t y)
---
> init(size_type x, size_type y)
2529c2530
< this->params.size = (int)rint((max - min) / bkt + 1.0);
---
> this->params.size = (size_type)rint((max - min) / bkt + 1.0);
2609c2610
< init(int size, Counter min, Counter max, Counter bkt)
---
> init(size_type size, Counter min, Counter max, Counter bkt)
2614c2615
< this->params.size = (int)rint((max - min) / bkt + 1.0);
---
> this->params.size = rint((max - min) / bkt + 1.0);
2643c2644
< init(int size)
---
> init(size_type size)
2673c2674
< init(int size)
---
> init(size_type size)
2717c2718
< size_t size() const;
---
> size_type size() const;
2760c2761
< virtual size_t size() const { return s.size(); }
---
> virtual size_type size() const { return s.size(); }
2825c2826
< virtual size_t size() const { return formula.size(); }
---
> virtual size_type size() const { return formula.size(); }
< virtual size_t size() const = 0;
---
> virtual size_type size() const = 0;
185c185
< int s = size();
---
> size_type s = size();
210c210
< virtual size_t size() const { return s.size(); }
---
> virtual size_type size() const { return s.size(); }
251c251
< int size;
---
> size_type size;
293c293
< virtual size_t size() const = 0;
---
> virtual size_type size() const = 0;
298c298
< int s = size();
---
> size_type s = size();
318c318
< virtual size_t size() const { return s.size(); }
---
> virtual size_type size() const { return s.size(); }
339,340c339,340
< mutable int x;
< mutable int y;
---
> mutable size_type x;
> mutable size_type y;
509c509
< subname(int index, const std::string &name)
---
> subname(off_type index, const std::string &name)
526c526
< subdesc(int index, const std::string &desc)
---
> subdesc(off_type index, const std::string &desc)
551c551
< for (int i = 0; i < this->y; ++i)
---
> for (off_type i = 0; i < this->y; ++i)
557c557
< ysubname(int index, const std::string subname)
---
> ysubname(off_type index, const std::string subname)
835c835
< size_t size() const { return 1; }
---
> size_type size() const { return 1; }
859c859
< virtual size_t size() const { return 1; }
---
> virtual size_type size() const { return 1; }
919c919
< size_t size() const { return proxy->size(); }
---
> size_type size() const { return proxy->size(); }
945c945
< int index;
---
> off_type index;
966c966
< ScalarProxy(Stat *s, int i)
---
> ScalarProxy(Stat *s, off_type i)
1050c1050
< size_t size() const { return 1; }
---
> size_type size() const { return 1; }
1086c1086
< size_t _size;
---
> size_type _size;
1097c1097
< Storage *data(int index) { return &storage[index]; }
---
> Storage *data(off_type index) { return &storage[index]; }
1104c1104
< const Storage *data(int index) const { return &storage[index]; }
---
> const Storage *data(off_type index) const { return &storage[index]; }
1107c1107
< doInit(int s)
---
> doInit(size_type s)
1116c1116
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1127c1127
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1139c1139
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1151c1151
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1159c1159
< size_t size() const { return _size; }
---
> size_type size() const { return _size; }
1164c1164
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1179c1179
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1193c1193
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1204c1204
< operator[](int index)
---
> operator[](off_type index)
1218,1219c1218,1219
< int offset;
< int len;
---
> off_type offset;
> size_type len;
1225c1225
< data(int index)
---
> data(off_type index)
1232c1232
< data(int index) const
---
> data(off_type index) const
1244c1244
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1254c1254
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1260c1260
< VectorProxy(Stat *s, int o, int l)
---
> VectorProxy(Stat *s, off_type o, size_type l)
1280c1280
< operator[](int index)
---
> operator[](off_type index)
1286c1286
< size_t size() const { return len; }
---
> size_type size() const { return len; }
1305,1307c1305,1307
< size_t x;
< size_t y;
< size_t _size;
---
> size_type x;
> size_type y;
> size_type _size;
1312,1313c1312,1313
< Storage *data(int index) { return &storage[index]; }
< const Storage *data(int index) const { return &storage[index]; }
---
> Storage *data(off_type index) { return &storage[index]; }
> const Storage *data(off_type index) const { return &storage[index]; }
1316c1316
< doInit(int _x, int _y)
---
> doInit(size_type _x, size_type _y)
1332c1332
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1348c1348
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1356c1356
< int size = this->size();
---
> size_type size = this->size();
1358c1358
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
1362c1362
< std::string ysubname(int i) const { return (*this->y_subnames)[i]; }
---
> std::string ysubname(off_type i) const { return (*this->y_subnames)[i]; }
1365c1365
< operator[](int index)
---
> operator[](off_type index)
1367c1367
< int offset = index * y;
---
> off_type offset = index * y;
1373c1373
< size_t
---
> size_type
1384c1384
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1397c1397
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1430c1430
< int size;
---
> size_type size;
1473c1473,1474
< size_t index = std::floor((val - params.min) / params.bucket_size);
---
> size_type index =
> (size_type)std::floor((val - params.min) / params.bucket_size);
1495c1496
< size_t size(const Params &) const { return cvec.size(); }
---
> size_type size(const Params &) const { return cvec.size(); }
1521c1522
< for (int i = 0; i < params.size; ++i)
---
> for (off_type i = 0; i < params.size; ++i)
1540,1541c1541,1542
< int size = cvec.size();
< for (int i = 0; i < size; ++i)
---
> size_type size = cvec.size();
> for (off_type i = 0; i < size; ++i)
1608c1609
< size_t size(const Params &) const { return 1; }
---
> size_type size(const Params &) const { return 1; }
1678c1679
< size_t size(const Params ¶ms) const { return 1; }
---
> size_type size(const Params ¶ms) const { return 1; }
1760c1761
< size_t size() const { return data()->size(params); }
---
> size_type size() const { return data()->size(params); }
1804c1805
< size_t _size;
---
> size_type _size;
1809c1810
< data(int index)
---
> data(off_type index)
1815c1816
< data(int index) const
---
> data(off_type index) const
1821c1822
< doInit(int s)
---
> doInit(size_type s)
1830c1831
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1846c1847
< for (int i = 0; i < _size; ++i)
---
> for (off_type i = 0; i < _size; ++i)
1851c1852
< Proxy operator[](int index);
---
> Proxy operator[](off_type index);
1853c1854
< size_t
---
> size_type
1864c1865
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1877c1878
< for (int i = 0; i < size(); ++i)
---
> for (off_type i = 0; i < size(); ++i)
1890c1891
< int size = this->size();
---
> size_type size = this->size();
1892c1893
< for (int i = 0; i < size; ++i) {
---
> for (off_type i = 0; i < size; ++i) {
1904c1905
< int index;
---
> off_type index;
1911c1912
< DistProxy(Stat *s, int i)
---
> DistProxy(Stat *s, off_type i)
1935c1936
< size_t
---
> size_type
1955c1956
< VectorDistBase<Storage>::operator[](int index)
---
> VectorDistBase<Storage>::operator[](off_type index)
1964c1965
< VectorDistBase<Storage>::total(int index) const
---
> VectorDistBase<Storage>::total(off_type index) const
1966,1967c1967,1968
< int total = 0;
< for (int i = 0; i < x_size(); ++i)
---
> Result total = 0;
> for (off_type i = 0; i < x_size(); ++i)
1989c1990
< virtual size_t size() const = 0;
---
> virtual size_type size() const = 0;
2028c2029
< virtual size_t size() const { return 1; }
---
> virtual size_type size() const { return 1; }
2061c2062
< virtual size_t
---
> virtual size_type
2087c2088
< virtual size_t size() const { return data->size(); }
---
> virtual size_type size() const { return data->size(); }
2102c2103
< virtual size_t size() const { return 1; }
---
> virtual size_type size() const { return 1; }
2119c2120
< int size = this->size();
---
> size_type size = this->size();
2121c2122
< for (int i = 0; i < size; i++)
---
> for (off_type i = 0; i < size; i++)
2126c2127
< virtual size_t size() const { return vresult.size(); }
---
> virtual size_type size() const { return vresult.size(); }
2130c2131
< int size = this->size();
---
> size_type size = this->size();
2132c2133
< for (int i = 0; i < size; i++)
---
> for (off_type i = 0; i < size; i++)
2192c2193
< int size = lvec.size();
---
> size_type size = lvec.size();
2198c2199
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2209c2210
< for (int i = 0; i < size(); i++)
---
> for (off_type i = 0; i < size(); i++)
2214c2215
< virtual size_t size() const { return l->size(); }
---
> virtual size_type size() const { return l->size(); }
2247c2248
< int size = rvec.size();
---
> size_type size = rvec.size();
2249c2250
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2252c2253
< int size = lvec.size();
---
> size_type size = lvec.size();
2254c2255
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2257c2258
< int size = rvec.size();
---
> size_type size = rvec.size();
2259c2260
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2271c2272
< for (int i = 0; i < size(); i++)
---
> for (off_type i = 0; i < size(); i++)
2276c2277
< virtual size_t
---
> virtual size_type
2279,2280c2280,2281
< int ls = l->size();
< int rs = r->size();
---
> size_type ls = l->size();
> size_type rs = r->size();
2312c2313
< int size = lvec.size();
---
> size_type size = lvec.size();
2318c2319
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2328c2329
< int size = lvec.size();
---
> size_type size = lvec.size();
2334c2335
< for (int i = 0; i < size; ++i)
---
> for (off_type i = 0; i < size; ++i)
2340c2341
< virtual size_t size() const { return 1; }
---
> virtual size_type size() const { return 1; }
2455c2456
< init(size_t size)
---
> init(size_type size)
2477c2478
< init(size_t size)
---
> init(size_type size)
2494c2495
< init(size_t x, size_t y)
---
> init(size_type x, size_type y)
2529c2530
< this->params.size = (int)rint((max - min) / bkt + 1.0);
---
> this->params.size = (size_type)rint((max - min) / bkt + 1.0);
2609c2610
< init(int size, Counter min, Counter max, Counter bkt)
---
> init(size_type size, Counter min, Counter max, Counter bkt)
2614c2615
< this->params.size = (int)rint((max - min) / bkt + 1.0);
---
> this->params.size = rint((max - min) / bkt + 1.0);
2643c2644
< init(int size)
---
> init(size_type size)
2673c2674
< init(int size)
---
> init(size_type size)
2717c2718
< size_t size() const;
---
> size_type size() const;
2760c2761
< virtual size_t size() const { return s.size(); }
---
> virtual size_type size() const { return s.size(); }
2825c2826
< virtual size_t size() const { return formula.size(); }
---
> virtual size_type size() const { return formula.size(); }