Changeset e604cd in git for kernel

Timestamp:

Nov 25, 2005, 11:17:58 AM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

f498f1081627c853c4d77077fcaa2ea32d82a711

Parents:

84578647043da515b0705f610dde44cdd285907c

Message:

*bricken: generalization


git-svn-id: file:///usr/local/Singular/svn/trunk@8811 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/Poly.h (modified) (7 diffs)

kernel/Poly.h

@@ -1 @@
-//$Id: Poly.h,v 1.30 2005-11-24 15:57:10 bricken Exp $
+//$Id: Poly.h,v 1.31 2005-11-25 10:17:58 bricken Exp $
 
 
@@ -17 +17 @@
 
 #include <vector>
+#include <exception>
+using std::exception;
 
 #define BOOST_DISABLE_THREADS
 
+class DifferentDomainException: public exception{
+
+};
+class ExceptionBasedErrorHandler{
+    public:
+        static const bool handleErrors=true;
+        static void handleDifferentRing(ring r, ring s){
+        PrintS("throwing");
+        throw DifferentDomainException();
+    }
+};
 
 //PolyImpl is a 08/15 poly wrapper
@@ -25 +38 @@
 class TrivialErrorHandler{
     public:
-    static const bool handle_errors=false;
-    static void handle(){
+    static const bool handleErrors=false;
+    static void handleDifferentRing(ring r, ring s){
     }
 };
@@ -357 +370 @@
     return p_Copy(ptr->p,ptr->r);
   }
-  
+  template<class T> void checkIsSameRing(T& p){
+    if (error_handle_traits::handleErrors){
+                 if (p.getRing()!=this->getRing()){
+   error_handle_traits::handleDifferentRing(
+    this->getRing(),
+    p.getRing()
+   );
+        }
+    }
+  }
   typedef create_type_input create_type;
   typedef PolyInputIterator<create_type> iterator;
@@ -398 +420 @@
 
   PolyBase& operator+=(const PolyBase& p2){
+    checkIsSameRing(p2);
     copy_on_write();
     *ptr += *p2.ptr;
@@ -465 +488 @@
 };
 
-class Poly: public PolyBase<POLY_VARIANT_RING, Poly, TrivialErrorHandler>{
+class Poly: public PolyBase<POLY_VARIANT_RING, Poly, ExceptionBasedErrorHandler>{
  private:
-    typedef PolyBase<POLY_VARIANT_RING, Poly,TrivialErrorHandler> Base;
+    typedef PolyBase<POLY_VARIANT_RING, Poly,ExceptionBasedErrorHandler> Base;
   friend class Vector;
-  friend class PolyBase<POLY_VARIANT_MODUL,Vector,TrivialErrorHandler>;
+  friend class PolyBase<POLY_VARIANT_MODUL,Vector,ExceptionBasedErrorHandler>;
  public:
 
@@ -519 +542 @@
 
 };
-class Vector: public PolyBase<POLY_VARIANT_MODUL, Vector, TrivialErrorHandler>{
+class Vector: public PolyBase<POLY_VARIANT_MODUL, Vector, ExceptionBasedErrorHandler>{
  private:
-    typedef PolyBase<POLY_VARIANT_MODUL, Vector, TrivialErrorHandler> Base;
+    typedef PolyBase<POLY_VARIANT_MODUL, Vector, ExceptionBasedErrorHandler> Base;
  public: