From 1476ba372df04aed1bf4548cd9f0a6bde5209941 Mon Sep 17 00:00:00 2001
From: Nicolas Marsic <nicolas.marsic@gmail.com>
Date: Fri, 6 Sep 2013 06:35:27 +0000
Subject: [PATCH] Bug Fix: forgot to copy next choices when unserializing a
permutation tree
---
FunctionSpace/PermutationTree.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/FunctionSpace/PermutationTree.cpp b/FunctionSpace/PermutationTree.cpp
index 1713e49dde..fb18a60d05 100644
--- a/FunctionSpace/PermutationTree.cpp
+++ b/FunctionSpace/PermutationTree.cpp
@@ -191,11 +191,14 @@ void PermutationTree::rebuild(std::vector<unlink_t>& unlink){
list<node_t*> listOfLeaf;
for(size_t i = 1; i < nextNodeId; i++){
+ // Father
node[i]->father = node[unlink[i].fatherId];
+ // Son
for(size_t j = 0; j < node[i]->son.size(); j++)
node[i]->son[j] = node[unlink[i].sonId[j]];
+ // Leaf (if it is actualy a leaf)
if(node[i]->leafId != (size_t)(-1))
listOfLeaf.push_back(node[i]);
}
@@ -210,6 +213,9 @@ PermutationTree::node_t* PermutationTree::copy(unlink_t* unlink){
node->myChoice = unlink->myChoice;
node->nxtChoice.resize(unlink->nNxtChoice);
+ for(size_t i = 0; i < unlink->nNxtChoice; i++)
+ node->nxtChoice[i] = unlink->nxtChoice[i];
+
node->father = NULL;
node->son.resize(unlink->nSon);
--
GitLab