* in GiNaC functions */
/*
- * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2016 Johannes Gutenberg University Mainz, Germany
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <stdexcept>
-
#include "function.h"
#include "utils.h"
#include "remember.h"
-#ifndef NO_NAMESPACE_GINAC
+#include <stdexcept>
+
namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
//////////
// class remember_table_entry
{
GINAC_ASSERT(f.seq.size()==seq.size());
if (f.gethash()!=hashvalue) return false;
- for (unsigned i=0; i<seq.size(); ++i)
+ size_t num = seq.size();
+ for (size_t i=0; i<num; ++i)
if (!seq[i].is_equal(f.seq[i])) return false;
++last_access = access_counter;
++successful_hits;
return true;
}
-unsigned long remember_table_entry::access_counter=0;
+unsigned long remember_table_entry::access_counter = 0;
//////////
// class remember_table_list
void remember_table_list::add_entry(function const & f, ex const & result)
{
- if ((max_assoc_size!=0)&&
- (remember_strategy!=remember_strategies::delete_never)&&
+ if ((max_assoc_size!=0) &&
+ (remember_strategy!=remember_strategies::delete_never) &&
(size()>=max_assoc_size)) {
// table is full, we must delete an older entry
GINAC_ASSERT(size()>0); // there must be at least one entry
}
default:
throw(std::logic_error("remember_table_list::add_entry(): invalid remember_strategy"));
- }
+ }
GINAC_ASSERT(size()==max_assoc_size-1);
}
push_back(remember_table_entry(f,result));
bool remember_table_list::lookup_entry(function const & f, ex & result) const
{
- for (const_iterator cit=begin(); cit!=end(); ++cit) {
- if ((*cit).is_equal(f)) {
- result = (*cit).get_result();
+ const_iterator i = begin(), iend = end();
+ while (i != iend) {
+ if (i->is_equal(f)) {
+ result = i->get_result();
return true;
}
+ ++i;
}
return false;
}
{
// we keep max_assoc_size and remember_strategy if we need to clear
// all entries
-
+
// use some power of 2 next to s
table_size = 1 << log2(s);
init_table();
operator[](entry).add_entry(f,result);
}
-void remember_table::clear_all_entries(void)
+void remember_table::clear_all_entries()
{
clear();
init_table();
}
-void remember_table::init_table(void)
+void remember_table::init_table()
{
reserve(table_size);
for (unsigned i=0; i<table_size; ++i)
push_back(remember_table_list(max_assoc_size,remember_strategy));
}
-std::vector<remember_table> & remember_table::remember_tables(void)
+std::vector<remember_table> & remember_table::remember_tables()
{
- static std::vector<remember_table> * rt = new std::vector<remember_table>;
- return *rt;
+ static std::vector<remember_table> rt = std::vector<remember_table>();
+ return rt;
}
-#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC