steven/TinySTL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve insert efficiency

Browse Source
This commit is contained in:
邹晓航
2014-09-23 08:16:57 +08:00
parent a836f6b004
commit 160764ab51
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
TinySTL/Vector.h
View File

@@ -138,12 +138,12 @@ namespace TinySTL{
--finish_; --finish_;
dataAllocator::destroy(finish_); dataAllocator::destroy(finish_);
} }
iterator insert(iterator position, const value_type& val); iterator insert(const iterator& position, const value_type& val);
void insert(iterator position, const size_type& n, const value_type& val); void insert(const iterator& position, const size_type& n, const value_type& val);
template <class InputIterator> template <class InputIterator>
void insert(iterator position, InputIterator first, InputIterator last); void insert(const iterator& position, InputIterator first, InputIterator last);
iterator erase(iterator position); iterator erase(const iterator& position);
iterator erase(iterator first, iterator last); iterator erase(const iterator& first, const iterator& last);
//<2F><><EFBFBD><EFBFBD><EFBFBD>Ŀռ<C4BF><D5BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //<2F><><EFBFBD><EFBFBD><EFBFBD>Ŀռ<C4BF><D5BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Alloc get_allocator(){ return dataAllocator; } Alloc get_allocator(){ return dataAllocator; }
@@ -175,12 +175,12 @@ namespace TinySTL{
allocateAndFillN(n, value); allocateAndFillN(n, value);
} }
template<class InputIterator> template<class InputIterator>
void insert_aux(iterator position, InputIterator first, InputIterator last, std::false_type); void insert_aux(const iterator& position, InputIterator first, InputIterator last, std::false_type);
template<class Integer> template<class Integer>
void insert_aux(iterator position, Integer n, const value_type& value, std::true_type); void insert_aux(const iterator& position, Integer n, const value_type& value, std::true_type);
template<class InputIterator> template<class InputIterator>
void reallocateAndCopy(iterator position, InputIterator first, InputIterator last); void reallocateAndCopy(const iterator& position, InputIterator first, InputIterator last);
void reallocateAndFillN(iterator position, const size_type& n, const value_type& val); void reallocateAndFillN(const iterator& position, const size_type& n, const value_type& val);
size_type getNewCapacity(size_type len)const{ size_type getNewCapacity(size_type len)const{
size_type oldCapacity = endOfStorage_ - start_; size_type oldCapacity = endOfStorage_ - start_;
auto res = std::max(oldCapacity, len); auto res = std::max(oldCapacity, len);
@@ -224,11 +224,11 @@ namespace TinySTL{
} }
//***************<2A>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>************************** //***************<2A>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>**************************
template<class T,class Alloc> template<class T,class Alloc>
typename vector<T, Alloc>::iterator vector<T, Alloc>::erase(iterator position){ typename vector<T, Alloc>::iterator vector<T, Alloc>::erase(const iterator& position){
return erase(position, position + 1); return erase(position, position + 1);
} }
template<class T, class Alloc> template<class T, class Alloc>
typename vector<T, Alloc>::iterator vector<T, Alloc>::erase(iterator first, iterator last){ typename vector<T, Alloc>::iterator vector<T, Alloc>::erase(const iterator& first, const iterator& last){
//β<><CEB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //β<><CEB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
difference_type lenOfTail = end() - last; difference_type lenOfTail = end() - last;
//ɾȥ<C9BE>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD>Ŀ //ɾȥ<C9BE>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD>Ŀ
@@ -242,7 +242,7 @@ namespace TinySTL{
} }
template<class T, class Alloc> template<class T, class Alloc>
template<class InputIterator> template<class InputIterator>
void vector<T, Alloc>::reallocateAndCopy(iterator position, InputIterator first, InputIterator last){ void vector<T, Alloc>::reallocateAndCopy(const iterator& position, InputIterator first, InputIterator last){
difference_type newCapacity = getNewCapacity(last - first); difference_type newCapacity = getNewCapacity(last - first);
T *newStart = dataAllocator::allocate(newCapacity); T *newStart = dataAllocator::allocate(newCapacity);
@@ -257,7 +257,7 @@ namespace TinySTL{
endOfStorage_ = newEndOfStorage; endOfStorage_ = newEndOfStorage;
} }
template<class T, class Alloc> template<class T, class Alloc>
void vector<T, Alloc>::reallocateAndFillN(iterator position, const size_type& n, const value_type& val){ void vector<T, Alloc>::reallocateAndFillN(const iterator& position, const size_type& n, const value_type& val){
difference_type newCapacity = getNewCapacity(n); difference_type newCapacity = getNewCapacity(n);
T *newStart = dataAllocator::allocate(newCapacity); T *newStart = dataAllocator::allocate(newCapacity);
@@ -273,7 +273,7 @@ namespace TinySTL{
} }
template<class T, class Alloc> template<class T, class Alloc>
template<class InputIterator> template<class InputIterator>
void vector<T, Alloc>::insert_aux(iterator position, void vector<T, Alloc>::insert_aux(const iterator& position,
InputIterator first, InputIterator first,
InputIterator last, InputIterator last,
std::false_type){ std::false_type){
@@ -293,7 +293,7 @@ namespace TinySTL{
} }
template<class T, class Alloc> template<class T, class Alloc>
template<class Integer> template<class Integer>
void vector<T, Alloc>::insert_aux(iterator position, Integer n, const value_type& value, std::true_type){ void vector<T, Alloc>::insert_aux(const iterator& position, Integer n, const value_type& value, std::true_type){
assert(n != 0); assert(n != 0);
difference_type locationLeft = endOfStorage_ - finish_; // the size of left storage difference_type locationLeft = endOfStorage_ - finish_; // the size of left storage
difference_type locationNeed = n; difference_type locationNeed = n;
@@ -312,15 +312,15 @@ namespace TinySTL{
} }
template<class T, class Alloc> template<class T, class Alloc>
template<class InputIterator> template<class InputIterator>
void vector<T, Alloc>::insert(iterator position, InputIterator first, InputIterator last){ void vector<T, Alloc>::insert(const iterator& position, InputIterator first, InputIterator last){
insert_aux(position, first, last, typename std::is_integral<InputIterator>::type()); insert_aux(position, first, last, typename std::is_integral<InputIterator>::type());
} }
template<class T, class Alloc> template<class T, class Alloc>
void vector<T, Alloc>::insert(iterator position, const size_type& n, const value_type& val){ void vector<T, Alloc>::insert(const iterator& position, const size_type& n, const value_type& val){
insert_aux(position, n, val, typename std::is_integral<size_type>::type()); insert_aux(position, n, val, typename std::is_integral<size_type>::type());
} }
template<class T, class Alloc> template<class T, class Alloc>
typename vector<T, Alloc>::iterator vector<T, Alloc>::insert(iterator position, const value_type& val){ typename vector<T, Alloc>::iterator vector<T, Alloc>::insert(const iterator& position, const value_type& val){
insert(position, 1, val); insert(position, 1, val);
return position; return position;
} }