* in GiNaC functions */
/*
- * GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2019 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"
+#include <stdexcept>
+
namespace GiNaC {
//////////
{
GINAC_ASSERT(f.seq.size()==seq.size());
if (f.gethash()!=hashvalue) return false;
- unsigned num = seq.size();
- for (unsigned i=0; i<num; ++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;
}
case remember_strategies::delete_lru: {
// delete least recently used entry
- iterator it = begin();
- iterator lowest_access_it = it;
+ auto it = begin();
+ auto lowest_access_it = it;
unsigned long lowest_access = (*it).get_last_access();
++it;
while (it!=end()) {
}
case remember_strategies::delete_lfu: {
// delete least frequently used entry
- iterator it = begin();
- iterator lowest_hits_it = it;
+ auto it = begin();
+ auto lowest_hits_it = it;
unsigned lowest_hits = (*it).get_successful_hits();
++it;
while (it!=end()) {
}
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
{
- const_iterator i = begin(), iend = end();
+ auto i = begin(), iend = end();
while (i != iend) {
if (i->is_equal(f)) {
result = i->get_result();
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;
}
} // namespace GiNaC