X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fclifford.cpp;h=fc6604dcecbe3c865c73e5554c12533031cab3b2;hp=ff98011fb39739ae827443ede2f395a08e57d8b5;hb=bfd4561481fc308e8db75c5a33b56787a43e6568;hpb=afdd7fa8c6c0a587f7c80789198551383e8beb7b

diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp
index ff98011f..fc6604dc 100644
--- a/ginac/clifford.cpp
+++ b/ginac/clifford.cpp
@@ -4,7 +4,7 @@
  *  No real implementation yet, to be done.     */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -29,9 +29,9 @@
 #include "utils.h"
 #include "debugmsg.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -41,48 +41,48 @@ namespace GiNaC {
 
 clifford::clifford()
 {
-    debugmsg("clifford default constructor",LOGLEVEL_CONSTRUCT);
-    serial=next_serial++;
-    name=autoname_prefix()+ToString(serial);
-    tinfo_key=TINFO_clifford;
+	debugmsg("clifford default constructor",LOGLEVEL_CONSTRUCT);
+	serial=next_serial++;
+	name=autoname_prefix()+ToString(serial);
+	tinfo_key=TINFO_clifford;
 }
 
 clifford::~clifford()
 {
-    debugmsg("clifford destructor",LOGLEVEL_DESTRUCT);
-    destroy(0);
+	debugmsg("clifford destructor",LOGLEVEL_DESTRUCT);
+	destroy(false);
 }
 
-clifford::clifford(clifford const & other)
+clifford::clifford(const clifford & other)
 {
-    debugmsg("clifford copy constructor",LOGLEVEL_CONSTRUCT);
-    copy (other);
+	debugmsg("clifford copy constructor",LOGLEVEL_CONSTRUCT);
+	copy (other);
 }
 
-clifford const & clifford::operator=(clifford const & other)
+const clifford & clifford::operator=(const clifford & other)
 {
-    debugmsg("clifford operator=",LOGLEVEL_ASSIGNMENT);
-    if (this != &other) {
-        destroy(1);
-        copy(other);
-    }
-    return *this;
+	debugmsg("clifford operator=",LOGLEVEL_ASSIGNMENT);
+	if (this != &other) {
+		destroy(true);
+		copy(other);
+	}
+	return *this;
 }
 
 // protected
 
-void clifford::copy(clifford const & other)
+void clifford::copy(const clifford & other)
 {
-    indexed::copy(other);
-    name=other.name;
-    serial=other.serial;
+	indexed::copy(other);
+	name=other.name;
+	serial=other.serial;
 }
 
 void clifford::destroy(bool call_parent)
 {
-    if (call_parent) {
-        indexed::destroy(call_parent);
-    }
+	if (call_parent) {
+		indexed::destroy(call_parent);
+	}
 }
 
 //////////
@@ -91,12 +91,12 @@ void clifford::destroy(bool call_parent)
 
 // public
 
-clifford::clifford(string const & initname)
+clifford::clifford(const std::string & initname)
 {
-    debugmsg("clifford constructor from string",LOGLEVEL_CONSTRUCT);
-    name=initname;
-    serial=next_serial++;
-    tinfo_key=TINFO_clifford;
+	debugmsg("clifford constructor from string",LOGLEVEL_CONSTRUCT);
+	name=initname;
+	serial=next_serial++;
+	tinfo_key=TINFO_clifford;
 }
 
 //////////
@@ -107,72 +107,73 @@ clifford::clifford(string const & initname)
 
 basic * clifford::duplicate() const
 {
-    debugmsg("clifford duplicate",LOGLEVEL_DUPLICATE);
-    return new clifford(*this);
+	debugmsg("clifford duplicate",LOGLEVEL_DUPLICATE);
+	return new clifford(*this);
 }
 
-void clifford::printraw(ostream & os) const
+void clifford::printraw(std::ostream & os) const
 {
-    debugmsg("clifford printraw",LOGLEVEL_PRINT);
-    os << "clifford(" << "name=" << name << ",serial=" << serial
-       << ",indices=";
-    printrawindices(os);
-    os << ",hash=" << hashvalue << ",flags=" << flags << ")";
+	debugmsg("clifford printraw",LOGLEVEL_PRINT);
+	os << "clifford(" << "name=" << name << ",serial=" << serial
+	   << ",indices=";
+	printrawindices(os);
+	os << ",hash=" << hashvalue << ",flags=" << flags << ")";
 }
 
-void clifford::printtree(ostream & os, unsigned indent) const
+void clifford::printtree(std::ostream & os, unsigned indent) const
 {
-    debugmsg("clifford printtree",LOGLEVEL_PRINT);
-    os << string(indent,' ') << name << " (clifford): "
-       << "serial=" << serial << ","
-       << seq.size() << "indices=";
-    printtreeindices(os,indent);
-    os << ", hash=" << hashvalue << " (0x" << hex << hashvalue << dec << ")"
-       << ", flags=" << flags << endl;
+	debugmsg("clifford printtree",LOGLEVEL_PRINT);
+	os << std::string(indent,' ') << name << " (clifford): "
+	   << "serial=" << serial << ","
+	   << seq.size() << "indices=";
+	printtreeindices(os, indent);
+	os << ", hash=" << hashvalue
+	   << " (0x" << std::hex << hashvalue << std::dec << ")"
+	   << ", flags=" << flags << std::endl;
 }
 
-void clifford::print(ostream & os, unsigned upper_precedence) const
+void clifford::print(std::ostream & os, unsigned upper_precedence) const
 {
-    debugmsg("clifford print",LOGLEVEL_PRINT);
-    os << name;
-    printindices(os);
+	debugmsg("clifford print",LOGLEVEL_PRINT);
+	os << name;
+	printindices(os);
 }
 
-void clifford::printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const
+void clifford::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
 {
-    debugmsg("clifford print csrc",LOGLEVEL_PRINT);
-    print(os,upper_precedence);
+	debugmsg("clifford print csrc",LOGLEVEL_PRINT);
+	print(os,upper_precedence);
 }
 
 bool clifford::info(unsigned inf) const
 {
-    return indexed::info(inf);
+	return indexed::info(inf);
 }
 
 // protected
 
-int clifford::compare_same_type(basic const & other) const
+int clifford::compare_same_type(const basic & other) const
 {
-    GINAC_ASSERT(other.tinfo() == TINFO_clifford);
-    const clifford *o = static_cast<const clifford *>(&other);
-    if (serial==o->serial) {
-        return indexed::compare_same_type(other);
-    }
-    return serial < o->serial ? -1 : 1;
+	GINAC_ASSERT(other.tinfo() == TINFO_clifford);
+	const clifford *o = static_cast<const clifford *>(&other);
+	if (serial==o->serial) {
+		return indexed::compare_same_type(other);
+	}
+	return serial < o->serial ? -1 : 1;
 }
 
-ex clifford::simplify_ncmul(exvector const & v) const
+ex clifford::simplify_ncmul(const exvector & v) const
 {
-    return simplified_ncmul(v);
+	return simplified_ncmul(v);
 }
 
 unsigned clifford::calchash(void) const
 {
-    hashvalue=golden_ratio_hash(golden_ratio_hash(0x55555556U ^
-                                                  golden_ratio_hash(tinfo_key) ^
-                                                  serial));
-    setflag(status_flags::hash_calculated);
-    return hashvalue;
+	hashvalue=golden_ratio_hash(golden_ratio_hash(0x55555556U ^
+												  golden_ratio_hash(tinfo_key) ^
+												  serial));
+	setflag(status_flags::hash_calculated);
+	return hashvalue;
 }
 
 //////////
@@ -185,17 +186,17 @@ unsigned clifford::calchash(void) const
 // non-virtual functions in this class
 //////////
 
-void clifford::setname(string const & n)
+void clifford::setname(const std::string & n)
 {
-    name=n;
+	name = n;
 }
 
 // private
 
-string & clifford::autoname_prefix(void)
+std::string & clifford::autoname_prefix(void)
 {
-    static string * s=new string("clifford");
-    return *s;
+	static std::string * s = new std::string("clifford");
+	return *s;
 }
 
 //////////
@@ -211,8 +212,8 @@ unsigned clifford::next_serial=0;
 //////////
 
 const clifford some_clifford;
-type_info const & typeid_clifford=typeid(some_clifford);
+const std::type_info & typeid_clifford = typeid(some_clifford);
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC