Skip to content

GitLab

Commit 33cf4ebc authored by Davis King's avatar Davis King
Browse files

All I did in this change was rename memory_manager<char>::kernel_1a to default_memory_manager. 

default_memory_manager is way more readable and clear.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%404080
parent bfbb580b
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 45 deletions
dlib/sequence.h
View file @ 33cf4ebc
......@@ -10,7 +10,7 @@
#include "sequence/sequence_compare_1.h"
#include "sequence/sequence_sort_1.h"
#include "sequence/sequence_sort_2.h"
#include "memory_manager.h"
#include "algs.h"
......@@ -20,7 +20,7 @@ namespace dlib
template <
typename T,
typename mem_manager = memory_manager<char>::kernel_1a
typename mem_manager = default_memory_manager
>
class sequence
{
......
dlib/sequence/sequence_kernel_1.h
View file @ 33cf4ebc
......@@ -8,14 +8,13 @@
#include "../interfaces/enumerable.h"
#include "../interfaces/remover.h"
#include "../serialize.h"
#include "../memory_manager.h"
namespace dlib
{
template <
typename T,
typename mem_manager = memory_manager<char>::kernel_1a
typename mem_manager = default_memory_manager
>
class sequence_kernel_1 : public enumerable<T>,
public remover<T>
......
dlib/sequence/sequence_kernel_2.h
View file @ 33cf4ebc
......@@ -8,7 +8,6 @@
#include "../interfaces/enumerable.h"
#include "../interfaces/remover.h"
#include "../serialize.h"
#include "../memory_manager.h"
namespace dlib
{
......@@ -16,7 +15,7 @@ namespace dlib
template <
typename T,
typename mem_manager = memory_manager<char>::kernel_1a
typename mem_manager = default_memory_manager
>
class sequence_kernel_2 : public enumerable<T>,
public remover<T>
......
dlib/sequence/sequence_kernel_abstract.h
View file @ 33cf4ebc
......@@ -6,13 +6,13 @@
#include "../interfaces/enumerable.h"
#include "../interfaces/remover.h"
#include "../serialize.h"
#include "../memory_manager/memory_manager_kernel_abstract.h"
#include "../algs.h"
namespace dlib
{
template <
typename T,
typename mem_manager = memory_manager<char>::kernel_1a
typename mem_manager = default_memory_manager
>
class sequence : public enumerable<T>,
public remover<T>
......
dlib/set.h
View file @ 33cf4ebc
......@@ -12,7 +12,7 @@
#include "set/set_compare_1.h"
#include "memory_manager.h"
#include "algs.h"
#include <functional>
namespace dlib
......@@ -20,7 +20,7 @@ namespace dlib
template <
typename T,
typename mem_manager = memory_manager<char>::kernel_1a,
typename mem_manager = default_memory_manager,
typename compare = std::less<T>
>
class set
......
dlib/set/set_kernel_1.h
View file @ 33cf4ebc
......@@ -8,7 +8,6 @@
#include "../interfaces/enumerable.h"
#include "../interfaces/remover.h"
#include "../serialize.h"
#include "../memory_manager.h"
namespace dlib
{
......@@ -16,7 +15,7 @@ namespace dlib
template <
typename T,
typename bst_base,
typename mem_manager = memory_manager<char>::kernel_1a
typename mem_manager = default_memory_manager
>
class set_kernel_1 : public enumerable<const T>,
public asc_remover<T,typename bst_base::compare_type>
......
dlib/set/set_kernel_abstract.h
View file @ 33cf4ebc
......@@ -6,7 +6,7 @@
#include "../interfaces/enumerable.h"
#include "../interfaces/remover.h"
#include "../serialize.h"
#include "../memory_manager/memory_manager_kernel_abstract.h"
#include "../algs.h"
#include <functional>
namespace dlib
......@@ -14,7 +14,7 @@ namespace dlib
template <
typename T,
typename mem_manager = memory_manager<char>::kernel_1a,
typename mem_manager = default_memory_manager,
typename compare = std::less<T>
>
class set : public enumerable<const T>,
......
dlib/stack.h
View file @ 33cf4ebc
......@@ -5,14 +5,14 @@
#include "stack/stack_kernel_1.h"
#include "stack/stack_kernel_c.h"
#include "memory_manager.h"
#include "algs.h"
namespace dlib
{
template <
typename T,
typename mem_manager = memory_manager<char>::kernel_1a
typename mem_manager = default_memory_manager
>
class stack
{
......
dlib/stack/stack_kernel_1.h
View file @ 33cf4ebc
......@@ -8,14 +8,13 @@
#include "../interfaces/enumerable.h"
#include "../interfaces/remover.h"
#include "../serialize.h"
#include "../memory_manager.h"
namespace dlib
{
template <
typename T,
typename mem_manager = memory_manager<char>::kernel_1a
typename mem_manager = default_memory_manager
>
class stack_kernel_1 : public enumerable<T>,
public remover<T>
......
dlib/stack/stack_kernel_abstract.h
View file @ 33cf4ebc
......@@ -6,14 +6,14 @@
#include "../interfaces/enumerable.h"
#include "../interfaces/remover.h"
#include "../serialize.h"
#include "../memory_manager/memory_manager_kernel_abstract.h"
#include "../algs.h"
namespace dlib
{
template <
typename T,
typename mem_manager = memory_manager<char>::kernel_1a
typename mem_manager = default_memory_manager
>
class stack : public enumerable<T>,
public remover<T>
......
dlib/statistics/random_subset_selector.h
View file @ 33cf4ebc
......@@ -7,7 +7,6 @@
#include "../rand.h"
#include <vector>
#include "../algs.h"
#include "../memory_manager.h"
#include "../string.h"
#include "../serialize.h"
#include <iostream>
......@@ -36,7 +35,7 @@ namespace dlib
!*/
public:
typedef T type;
typedef memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
typedef Rand_type rand_type;
typedef typename std::vector<T>::iterator iterator;
......
dlib/statistics/random_subset_selector_abstract.h
View file @ 33cf4ebc
......@@ -5,7 +5,7 @@
#include <vector>
#include "../rand/rand_kernel_abstract.h"
#include "../memory_manager.h"
#include "../algs.h"
#include "../string.h"
namespace dlib
......@@ -71,7 +71,7 @@ namespace dlib
!*/
public:
typedef T type;
typedef memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
typedef Rand_type rand_type;
typedef typename std::vector<T>::iterator iterator;
......
dlib/svm/sparse_kernel.h
View file @ 33cf4ebc
......@@ -23,7 +23,7 @@ namespace dlib
{
typedef typename T::value_type::second_type scalar_type;
typedef T sample_type;
typedef dlib::memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
sparse_radial_basis_kernel(const scalar_type g) : gamma(g) {}
sparse_radial_basis_kernel() : gamma(0.1) {}
......@@ -105,7 +105,7 @@ namespace dlib
{
typedef typename T::value_type::second_type scalar_type;
typedef T sample_type;
typedef dlib::memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
sparse_polynomial_kernel(const scalar_type g, const scalar_type c, const scalar_type d) : gamma(g), coef(c), degree(d) {}
sparse_polynomial_kernel() : gamma(1), coef(0), degree(1) {}
......@@ -194,7 +194,7 @@ namespace dlib
{
typedef typename T::value_type::second_type scalar_type;
typedef T sample_type;
typedef dlib::memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
sparse_sigmoid_kernel(const scalar_type g, const scalar_type c) : gamma(g), coef(c) {}
sparse_sigmoid_kernel() : gamma(0.1), coef(-1.0) {}
......@@ -277,7 +277,7 @@ namespace dlib
{
typedef typename T::value_type::second_type scalar_type;
typedef T sample_type;
typedef dlib::memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
scalar_type operator() (
const sample_type& a,
......
dlib/svm/sparse_kernel_abstract.h
View file @ 33cf4ebc
......@@ -31,7 +31,7 @@ namespace dlib
typedef typename T::value_type::second_type scalar_type;
typedef T sample_type;
typedef dlib::memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
const scalar_type gamma;
......@@ -132,7 +132,7 @@ namespace dlib
typedef typename T::value_type::second_type scalar_type;
typedef T sample_type;
typedef dlib::memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
const scalar_type gamma;
const scalar_type coef;
......@@ -239,7 +239,7 @@ namespace dlib
typedef typename T::value_type::second_type scalar_type;
typedef T sample_type;
typedef dlib::memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
const scalar_type gamma;
const scalar_type coef;
......@@ -351,7 +351,7 @@ namespace dlib
typedef typename T::value_type::second_type scalar_type;
typedef T sample_type;
typedef dlib::memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
scalar_type operator() (
const sample_type& a,
......
dlib/test/kcentroid.cpp
View file @ 33cf4ebc
......@@ -35,7 +35,7 @@ namespace
{
typedef typename T::value_type::second_type scalar_type;
typedef T sample_type;
typedef dlib::memory_manager<char>::kernel_1a mem_manager_type;
typedef default_memory_manager mem_manager_type;
scalar_type operator() (
const sample_type& a,
......
dlib/test/matrix2.cpp
View file @ 33cf4ebc
......@@ -642,7 +642,7 @@ namespace
typedef matrix<double,0,0> mat;
matrix<double,0,0,memory_manager<char>::kernel_1a, column_major_layout> a(M,N);
matrix<double,0,0,default_memory_manager, column_major_layout> a(M,N);
for (long r = 0; r < a.nr(); ++r)
{
for (long c = 0; c < a.nc(); ++c)
......@@ -651,9 +651,9 @@ namespace
}
}
matrix<double,M,M,memory_manager<char>::kernel_1a, column_major_layout> u, u2;
matrix<double,0,0,memory_manager<char>::kernel_1a, column_major_layout> q, q2;
matrix<double,N,N,memory_manager<char>::kernel_1a, column_major_layout> v, v2;
matrix<double,M,M,default_memory_manager, column_major_layout> u, u2;
matrix<double,0,0,default_memory_manager, column_major_layout> q, q2;
matrix<double,N,N,default_memory_manager, column_major_layout> v, v2;
matrix<double,M,N,MM, column_major_layout> a2;
a2 = tmp(a/2);
......@@ -875,7 +875,7 @@ namespace
const long M = 9;
const long N = 40;
typedef matrix<double,0,0,memory_manager<char>::kernel_1a, column_major_layout> mat;
typedef matrix<double,0,0,default_memory_manager, column_major_layout> mat;
mat a(M,N);
for (long r = 0; r < a.nr(); ++r)
{
......
dlib/test/matrix_chol.cpp
View file @ 33cf4ebc
......@@ -134,7 +134,7 @@ namespace
test_cholesky(uniform_matrix<double>(15,15,1) + 10*symm(randmat<double>(15,15)));
test_cholesky(uniform_matrix<double>(101,101,1) + 10*symm(randmat<double>(101,101)));
typedef matrix<double,0,0,memory_manager<char>::kernel_1a, column_major_layout> mat;
typedef matrix<double,0,0,default_memory_manager, column_major_layout> mat;
test_cholesky(mat(uniform_matrix<double>(101,101,1) + 10*symm(randmat<double>(101,101))));
}
......@@ -147,7 +147,7 @@ namespace
test_cholesky(uniform_matrix<float>(2,2,1) + 2*symm(randmat<float>(2,2)));
test_cholesky(uniform_matrix<float>(3,3,1) + 2*symm(randmat<float>(3,3)));
typedef matrix<float,0,0,memory_manager<char>::kernel_1a, column_major_layout> mat;
typedef matrix<float,0,0,default_memory_manager, column_major_layout> mat;
test_cholesky(mat(uniform_matrix<float>(3,3,1) + 2*symm(randmat<float>(3,3))));
}
......
dlib/test/matrix_lu.cpp
View file @ 33cf4ebc
......@@ -156,7 +156,7 @@ namespace
test_lu(10*randmat<double,137,200>());
test_lu(10*randmat<double,200,101>());
typedef matrix<double,0,0,memory_manager<char>::kernel_1a, column_major_layout> mat;
typedef matrix<double,0,0,default_memory_manager, column_major_layout> mat;
test_lu(mat(3*randmat<double>(4,4)));
test_lu(mat(3*randmat<double>(9,4)));
test_lu(mat(3*randmat<double>(3,8)));
......@@ -186,7 +186,7 @@ namespace
test_lu(3*randmat<float,137,200>());
test_lu(3*randmat<float,200,101>());
typedef matrix<float,0,0,memory_manager<char>::kernel_1a, column_major_layout> mat;
typedef matrix<float,0,0,default_memory_manager, column_major_layout> mat;
test_lu(mat(3*randmat<float>(4,4)));
test_lu(mat(3*randmat<float>(9,4)));
test_lu(mat(3*randmat<float>(3,8)));
......
dlib/test/matrix_qr.cpp
View file @ 33cf4ebc
......@@ -149,7 +149,7 @@ namespace
test_qr(10*randmat<double,15,15>());
test_qr(10*randmat<double,100,100>());
typedef matrix<double,0,0,memory_manager<char>::kernel_1a, column_major_layout> mat;
typedef matrix<double,0,0,default_memory_manager, column_major_layout> mat;
test_qr(mat(3*randmat<double>(9,4)));
test_qr(mat(3*randmat<double>(9,9)));
}
......@@ -172,7 +172,7 @@ namespace
test_qr(3*randmat<float,4,4>());
test_qr(3*randmat<float,9,4>());
typedef matrix<float,0,0,memory_manager<char>::kernel_1a, column_major_layout> mat;
typedef matrix<float,0,0,default_memory_manager, column_major_layout> mat;
test_qr(mat(3*randmat<float>(9,4)));
test_qr(mat(3*randmat<float>(9,9)));
}
......
dlib/timer.h
View file @ 33cf4ebc
......@@ -6,7 +6,6 @@
#include "timer/timer_kernel_1.h"
#include "timer/timer_kernel_2.h"
#include "uintn.h"
#include "memory_manager.h"
namespace dlib
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment