Made unarchiving algorithms order N instead of order N^2.

[ginac.git] / ginac / pseries.cpp

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index 14488ba71c222b81e033379d51f61be66e94b062..bd8e4803a0feb57e9778ceda4cfe4d8e3cd3c56a 100644 (file)
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -82,14 +82,19 @@ pseries::pseries(const ex &rel_, const epvector &ops_) : basic(&pseries::tinfo_s
 
 pseries::pseries(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 {
-       for (unsigned int i=0; true; ++i) {
+       archive_node::archive_node_cit first = n.find_first("coeff");
+       archive_node::archive_node_cit last = n.find_last("power");
+       ++last;
+       seq.reserve((last-first)/2);
+
+       for (archive_node::archive_node_cit loc = first; loc < last;) {
                ex rest;
                ex coeff;
-               if (n.find_ex("coeff", rest, sym_lst, i) && n.find_ex("power", coeff, sym_lst, i))
-                       seq.push_back(expair(rest, coeff));
-               else
-                       break;
+               n.find_ex_by_loc(loc++, rest, sym_lst);
+               n.find_ex_by_loc(loc++, coeff, sym_lst);
+               seq.push_back(expair(rest, coeff));
        }
+
        n.find_ex("var", var, sym_lst);
        n.find_ex("point", point, sym_lst);
 }