ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/math/Polynomial.hpp
(Generate patch)

Comparing trunk/src/math/Polynomial.hpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

# Line 53 | Line 53
53   #include <list>
54   #include <map>
55   #include <utility>
56 <
56 > #include "config.h"
57   namespace oopse {
58  
59    template<typename ElemType> ElemType pow(ElemType x, int N) {
# Line 74 | Line 74 | namespace oopse {
74    class Polynomial {
75  
76    public:
77 <        
77 >    typedef Polynomial<ElemType> PolynomialType;    
78      typedef int ExponentType;
79      typedef ElemType CoefficientType;
80      typedef std::map<ExponentType, CoefficientType> PolynomialPairMap;
81      typedef typename PolynomialPairMap::iterator iterator;
82      typedef typename PolynomialPairMap::const_iterator const_iterator;
83 +
84 +    Polynomial() {}
85 +    Polynomial(ElemType v) {setCoefficient(0, v);}
86      /**
87       * Calculates the value of this Polynomial evaluated at the given x value.
88       * @return The value of this Polynomial evaluates at the given x value
# Line 185 | Line 188 | namespace oopse {
188      size_t size() {
189        return polyPairMap_.size();
190      }
191 <        
191 >
192 >    PolynomialType& operator += (const PolynomialType& p) {
193 >        typename Polynomial<ElemType>::const_iterator i;
194 >
195 >        for (i =  p.begin(); i  != p.end(); ++i) {
196 >          this->addCoefficient(i->first, i->second);
197 >        }
198 >
199 >        return *this;        
200 >    }
201 >
202 >    PolynomialType& operator -= (const PolynomialType& p) {
203 >        typename Polynomial<ElemType>::const_iterator i;
204 >        for (i =  p.begin(); i  != p.end(); ++i) {
205 >          this->addCoefficient(i->first, -i->second);
206 >        }        
207 >        return *this;
208 >    }
209 >
210 >    PolynomialType& operator *= (const PolynomialType& p) {
211 >    typename Polynomial<ElemType>::const_iterator i;
212 >    typename Polynomial<ElemType>::const_iterator j;
213 >    
214 >    for (i = this->begin(); i !=this->end(); ++i) {
215 >      for (j = p.begin(); j !=p.end(); ++j) {
216 >        this->addCoefficient( i->first + j->first, i->second * j->second);
217 >      }
218 >    }
219 >
220 >    return *this;
221 >    }
222 >
223 >  
224    private:
225          
226      PolynomialPairMap polyPairMap_;
# Line 211 | Line 246 | namespace oopse {
246      return p;
247    }
248  
249 +  template<typename ElemType>
250 +  Polynomial<ElemType> operator *(const Polynomial<ElemType>& p, const ElemType v) {
251 +    typename Polynomial<ElemType>::const_iterator i;
252 +    Polynomial<ElemType> result;
253 +    
254 +    for (i = p.begin(); i !=p.end(); ++i) {
255 +        result.addCoefficient( i->first , i->second * v);
256 +    }
257 +
258 +    return result;
259 +  }
260 +
261 +  template<typename ElemType>
262 +  Polynomial<ElemType> operator *( const ElemType v, const Polynomial<ElemType>& p) {
263 +    typename Polynomial<ElemType>::const_iterator i;
264 +    Polynomial<ElemType> result;
265 +    
266 +    for (i = p.begin(); i !=p.end(); ++i) {
267 +        result.addCoefficient( i->first , i->second * v);
268 +    }
269 +
270 +    return result;
271 +  }
272 +  
273    /**
274     * Generates and returns the sum of two given Polynomials.
275     * @param p1 the first polynomial
# Line 252 | Line 311 | namespace oopse {
311  
312    /**
313     * Tests if two polynomial have the same exponents
314 <   * @return true if these all of the exponents in these Polynomial are identical
314 >   * @return true if all of the exponents in these Polynomial are identical
315     * @param p1 the first polynomial
316     * @param p2 the second polynomial
317     * @note this function does not compare the coefficient
# Line 276 | Line 335 | namespace oopse {
335      return true;
336    }
337  
338 <  typedef Polynomial<double> DoublePolynomial;
338 >  typedef Polynomial<RealType> DoublePolynomial;
339  
340   } //end namespace oopse
341   #endif //MATH_POLYNOMIAL_HPP

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines