bug fix in XLink::Replace

source/tensor/Main.cpp

@@ -45,11 +45,11 @@ int main( int argc, const char ** argv )
     //_CrtSetBreakAlloc(123);
     //_CrtSetBreakAlloc(123);
 
 
     /* a tiny test */
     /* a tiny test */
-    if(false)
+    if(true)
         SmallTest();
         SmallTest();
 
 
     //_CrtDumpMemoryLeaks();
     //_CrtDumpMemoryLeaks();
-    //return 0;
+    return 0;
 
 
     if(argc > 1 && !strcmp(argv[1], "-test"))
     if(argc > 1 && !strcmp(argv[1], "-test"))
         Test();
         Test();

source/tensor/XLink.cpp

@@ -112,6 +112,8 @@ void XLink::ClearOutgoing(XTensor * node)
     }
     }
     
     
     outgo.ClearTail();
     outgo.ClearTail();
+    outgo.typeID = 0;
+    outgo.type[0] = 0;
 }
 }
 
 
 /*
 /*
@@ -148,6 +150,8 @@ void XLink::ClearIncoming(XTensor * node)
     }
     }
 
 
     income.ClearTail();
     income.ClearTail();
+    income.typeID = 0;
+    income.type[0] = 0;
 }
 }
 
 
 /* 
 /* 
@@ -360,32 +364,34 @@ void XLink::Replace(const XTensor * oldOne, XTensor * newOne)
     XLink::ClearOutgoing(newOne);
     XLink::ClearOutgoing(newOne);
     XLink::ClearIncoming(newOne);
     XLink::ClearIncoming(newOne);
 
 
-    if(newIncome.tailNum < oldOne->income.tailNum){
-        delete[] newIncome.tails;
-        newIncome.tails = new XTensor*[oldOne->income.tailNum];
-    }
-
     /* incoming nodes */
     /* incoming nodes */
-    newIncome.SetType(oldOne->income.typeID);
-    newIncome.head = newOne;
-    newIncome.tailNum = oldOne->income.tailNum;
-    memcpy(newIncome.tails, oldOne->income.tails, sizeof(XTensor*) * newIncome.tailNum);
-
-    /* update the link to each child node */
-    for(int i = 0; i < newIncome.tailNum; i++){
-        XTensor * child = newIncome.tails[i];
-        XLink &childOutgo = child->outgo;
-        bool hit = false;
-        for(int j = 0; j < childOutgo.tailNum; j++){
-            if(childOutgo.tails[j] == oldOne){
-                childOutgo.tails[j] = newOne;
-                hit = true;
-                break;
-            }
+    if(oldOne->income.typeID != 0){
+        if(newIncome.tailNum < oldOne->income.tailNum){
+            delete[] newIncome.tails;
+            newIncome.tails = new XTensor*[oldOne->income.tailNum];
         }
         }
+        
+        newIncome.SetType(oldOne->income.typeID);
+        newIncome.head = newOne;
+        newIncome.tailNum = oldOne->income.tailNum;
+        memcpy(newIncome.tails, oldOne->income.tails, sizeof(XTensor*) * newIncome.tailNum);
+
+        /* update the link to each child node */
+        for(int i = 0; i < newIncome.tailNum; i++){
+            XTensor * child = newIncome.tails[i];
+            XLink &childOutgo = child->outgo;
+            bool hit = false;
+            for(int j = 0; j < childOutgo.tailNum; j++){
+                if(childOutgo.tails[j] == oldOne){
+                    childOutgo.tails[j] = newOne;
+                    hit = true;
+                    break;
+                }
+            }
 
 
-        if(childOutgo.tailNum > 0){
-            CheckNTErrors(hit, "No proper node found in child.outgo edge!");
+            if(childOutgo.tailNum > 0){
+                CheckNTErrors(hit, "No proper node found in child.outgo edge!");
+            }
         }
         }
     }
     }