X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Findexed.h;h=51e60b5de1be0fdb23c4dc54f8067b391a60755e;hb=aed514f534cc6b4438822c1fcf80c203a828a94c;hp=93eecd27e45ba041b6293ac97846ee3f589ad603;hpb=67edef78ce992a8f6ad704bfac228b8dec6eacd2;p=ginac.git diff --git a/ginac/indexed.h b/ginac/indexed.h index 93eecd27..51e60b5d 100644 --- a/ginac/indexed.h +++ b/ginac/indexed.h @@ -3,7 +3,7 @@ * Interface to GiNaC's indexed expressions. */ /* - * GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2022 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 @@ -138,29 +138,29 @@ public: // internal constructors indexed(const symmetry & symm, const exprseq & es); - indexed(const symmetry & symm, const exvector & v, bool discardable = false); - indexed(const symmetry & symm, std::auto_ptr vp); + indexed(const symmetry & symm, const exvector & v); + indexed(const symmetry & symm, exvector && v); // functions overriding virtual functions from base classes public: - unsigned precedence() const {return 55;} - bool info(unsigned inf) const; - ex eval(int level = 0) const; - ex real_part() const; - ex imag_part() const; - exvector get_free_indices() const; + unsigned precedence() const override {return 55;} + bool info(unsigned inf) const override; + ex eval() const override; + ex real_part() const override; + ex imag_part() const override; + exvector get_free_indices() const override; /** Save (a.k.a. serialize) indexed object into archive. */ - void archive(archive_node& n) const; + void archive(archive_node& n) const override; /** Read (a.k.a. deserialize) indexed object from archive. */ - void read_archive(const archive_node& n, lst& syms); + void read_archive(const archive_node& n, lst& syms) override; protected: - ex derivative(const symbol & s) const; - ex thiscontainer(const exvector & v) const; - ex thiscontainer(std::auto_ptr vp) const; - unsigned return_type() const; - return_type_t return_type_tinfo() const { return op(0).return_type_tinfo(); } - ex expand(unsigned options = 0) const; + ex derivative(const symbol & s) const override; + ex thiscontainer(const exvector & v) const override; + ex thiscontainer(exvector && v) const override; + unsigned return_type() const override; + return_type_t return_type_tinfo() const override { return op(0).return_type_tinfo(); } + ex expand(unsigned options = 0) const override; // new virtual functions which can be overridden by derived classes // none @@ -255,7 +255,7 @@ protected: exvector get_all_dummy_indices(const ex & e); /** More reliable version of the form. The former assumes that e is an - * expanded epxression. */ + * expanded expression. */ exvector get_all_dummy_indices_safely(const ex & e); /** Returns b with all dummy indices, which are listed in va, renamed @@ -279,7 +279,7 @@ lst rename_dummy_indices_uniquely(const exvector & va, const exvector & vb); * indices with the corresponding numeric values without variance. * * @param e the given expression - * @param subs_idx indicates if variance of dummy indixes should be neglected + * @param subs_idx indicates if variance of dummy indices should be neglected */ ex expand_dummy_sum(const ex & e, bool subs_idx = false);