Changes on question 26, declaring the type of tree node value as double

zhedahht · zhedahht · commit e28f8fc43df4 · 2016-11-27T14:57:05.000-08:00
diff --git a/26_SubstructureInTree/26_SubstructureInTree.vcxproj b/26_SubstructureInTree/26_SubstructureInTree.vcxproj
@@ -144,11 +144,6 @@
   <ItemGroup>
     <ClCompile Include="SubstructureInTree.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Utilities\Utilities.vcxproj">
-      <Project>{732da13a-f8bb-4cef-b96d-61de60bdb6a7}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/26_SubstructureInTree/SubstructureInTree.cpp b/26_SubstructureInTree/SubstructureInTree.cpp
@@ -7,17 +7,24 @@
 // ��Ŀ���������ö�����A��B���ж�B�ǲ���A���ӽṹ��
 
 #include <cstdio>
-#include "..\Utilities\BinaryTree.h"
+
+struct BinaryTreeNode
+{
+    double                 m_dbValue;
+    BinaryTreeNode*        m_pLeft;
+    BinaryTreeNode*        m_pRight;
+};
 
 bool DoesTree1HaveTree2(BinaryTreeNode* pRoot1, BinaryTreeNode* pRoot2);
+bool Equal(double num1, double num2);
 
 bool HasSubtree(BinaryTreeNode* pRoot1, BinaryTreeNode* pRoot2)
 {
     bool result = false;
 
     if(pRoot1 != nullptr && pRoot2 != nullptr)
     {
-        if(pRoot1->m_nValue == pRoot2->m_nValue)
+        if(Equal(pRoot1->m_dbValue, pRoot2->m_dbValue))
             result = DoesTree1HaveTree2(pRoot1, pRoot2);
         if(!result)
             result = HasSubtree(pRoot1->m_pLeft, pRoot2);
@@ -36,13 +43,56 @@ bool DoesTree1HaveTree2(BinaryTreeNode* pRoot1, BinaryTreeNode* pRoot2)
     if(pRoot1 == nullptr)
         return false;
 
-    if(pRoot1->m_nValue != pRoot2->m_nValue)
+    if(!Equal(pRoot1->m_dbValue, pRoot2->m_dbValue))
         return false;
 
     return DoesTree1HaveTree2(pRoot1->m_pLeft, pRoot2->m_pLeft) &&
         DoesTree1HaveTree2(pRoot1->m_pRight, pRoot2->m_pRight);
 }
 
+bool Equal(double num1, double num2)
+{
+    if((num1 - num2 > -0.0000001) && (num1 - num2 < 0.0000001))
+        return true;
+    else
+        return false;
+}
+
+// ====================�������Դ���====================
+BinaryTreeNode* CreateBinaryTreeNode(double dbValue)
+{
+    BinaryTreeNode* pNode = new BinaryTreeNode();
+    pNode->m_dbValue = dbValue;
+    pNode->m_pLeft = nullptr;
+    pNode->m_pRight = nullptr;
+
+    return pNode;
+}
+
+void ConnectTreeNodes(BinaryTreeNode* pParent, BinaryTreeNode* pLeft, BinaryTreeNode* pRight)
+{
+    if(pParent != nullptr)
+    {
+        pParent->m_pLeft = pLeft;
+        pParent->m_pRight = pRight;
+    }
+}
+
+void DestroyTree(BinaryTreeNode* pRoot)
+{
+    if(pRoot != nullptr)
+    {
+        BinaryTreeNode* pLeft = pRoot->m_pLeft;
+        BinaryTreeNode* pRight = pRoot->m_pRight;
+
+        delete pRoot;
+        pRoot = nullptr;
+
+        DestroyTree(pLeft);
+        DestroyTree(pRight);
+    }
+}
+
 // ====================���Դ���====================
 void Test(char* testName, BinaryTreeNode* pRoot1, BinaryTreeNode* pRoot2, bool expected)
 {
