Changeset dbee17c in git

Timestamp:

Nov 6, 2009, 12:14:01 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '5d369c3cbad1a1bf2d5c856a48fb8a30b51cec3b')

Children:

83f349c17bc61f05628b00a81b245ebb3b00eac6

Parents:

3580b7115f22b137b32322afb07cb8febdf9e80c

Message:

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

File:

• Singular/Minor.cc (modified) (9 diffs)

Singular/Minor.cc

@@ -18 +18 @@
 
 MinorKey::MinorKey (const MinorKey& mk) {
+//printf("\n%s", "MinorKey::MinorKey copy");
     _numberOfRowBlocks = mk.getNumberOfRowBlocks();
     _numberOfColumnBlocks = mk.getNumberOfColumnBlocks();;
@@ -78 +79 @@
 MinorKey::MinorKey(const int lengthOfRowArray, const unsigned int* const rowKey,
                    const int lengthOfColumnArray, const unsigned int* const columnKey) {
+//printf("\n%s", "MinorKey::MinorKey (args)");
     _numberOfRowBlocks = lengthOfRowArray;
     _numberOfColumnBlocks = lengthOfColumnArray;
@@ -94 +96 @@
 
 MinorKey::~MinorKey() {
+//printf("\n%s", "MinorKey::~MinorKey");
     // free memory of _rowKey and _columnKey
     delete [] _rowKey;
@@ -870 +873 @@
                                 const int accumulatedMultiplications, const int accumulatedAdditions,
                                 const int retrievals, const int potentialRetrievals) {
+//printf("\n%s(%s)", "PolyMinorValue::PolyMinorValue (args)", pString(result));
     _result = pCopy(result);
     // std::cout << std::endl << "PolyMinorValue creator, " << pString(_result);
@@ -881 +885 @@
 
 PolyMinorValue::PolyMinorValue () {
-    _result = pISet(0);
+//printf("\n%s", "PolyMinorValue::PolyMinorValue ()");
+    _result = NULL;
     // std::cout << std::endl << "PolyMinorValue creator, " << pString(_result) << " STANDARD!";
     _multiplications = -1;
@@ -893 +898 @@
 PolyMinorValue::~PolyMinorValue()
 {
-  p_Delete(&_result, currRing);
+//printf("\n%s", "PolyMinorValue::~PolyMinorValue");
+    p_Delete(&_result, currRing);
 }
 
@@ -902 +908 @@
 int PolyMinorValue::getWeight () const {
     // put measure for size of PolyMinorValue here, e.g. the number of monomials
-    // the cached polynomial
+    // in the cached polynomial
     return pLength(_result); // the number of monomials in the polynomial
 }
 
 string PolyMinorValue::toString () const {
-    char h[10];
+    char h[20];
 
     // Let's see whether a cache has been used to compute this MinorValue:
@@ -936 +942 @@
 
 PolyMinorValue::PolyMinorValue (const PolyMinorValue& mv) {
+//printf("\n%s", "PolyMinorValue::PolyMinorValue copy");
     _result = pCopy(mv.getResult());
     _retrievals = mv.getRetrievals();
@@ -945 +952 @@
 }
 
-void PolyMinorValue::operator= (const PolyMinorValue& mv) {
-    pDelete(&_result);
+void PolyMinorValue::operator= (const PolyMinorValue& mv)
+{
+//printf("\nPolyMinorValue::operator=; mv = %s", mv.toString().c_str());
+    if (_result != mv.getResult()) pDelete(&_result);
     _result = pCopy(mv.getResult());
+//printf("\nPolyMinorValue::operator=; _result = %s", pString(_result));
     _retrievals = mv.getRetrievals();
     _potentialRetrievals = mv.getPotentialRetrievals();