Changeset 54 for trunk/Utilities/GenerateMathProblem01/GenerateMathProblem01.cpp

Timestamp:

Feb 23, 2012, 12:33:51 PM (10 years ago)

Author:

roman

Message:

 

File:

• trunk/Utilities/GenerateMathProblem01/GenerateMathProblem01.cpp (modified) (6 diffs)

trunk/Utilities/GenerateMathProblem01/GenerateMathProblem01.cpp

@@ -6 +6 @@
 
 #include "stdafx.h"
+#include <assert.h>
 
 class Item
@@ -62 +63 @@
         OperationItem() :
                 m_pItem1(NULL),
+                m_nSymbol(0),
                 m_pItem2(NULL)
         {
+        }
+        OperationItem(Item* pItem1, CHAR nSymbol, Item* pItem2) :
+                m_pItem1(pItem1),
+                m_nSymbol(nSymbol),
+                m_pItem2(pItem2)
+        {
+                assert(pItem1 && IsValidSymbol(nSymbol) && pItem2);
+        }
+        static BOOL IsValidSymbol(CHAR nSymbol)
+        {
+                return nSymbol && strchr("+-*:", nSymbol) != NULL;
         }
         INT GetPriority()
@@ -73 +86 @@
                         return 2;
                 case '*':
-                case '/':
+                case ':':
                         return 1;
                 }
@@ -83 +96 @@
                 {
                 case '-':
-                case '/':
+                case ':':
                         return FALSE;
                 }
@@ -95 +108 @@
                 else
                         sString.Append(m_pItem1->AsString());
+                assert(IsValidSymbol(m_nSymbol));
                 sString.AppendFormat(_T(" %c "), m_nSymbol);
                 if(m_pItem2->GetPriority() > GetPriority() || m_pItem2->IsOperation() && m_pItem2->GetPriority() == GetPriority() && !IsCommutative())
@@ -212 +226 @@
 int _tmain(int argc, _TCHAR* argv[])
 {
+        #pragma region Special Case
+        #if defined(_DEBUG)
+        {
+                // NOTE: 
+                //   Actual: (77 + 53503) : 8360 : 88 : 12
+                //   Correct: (77 + 53503) : (8360 : 88) : 12
+                OperationItem* pA = new OperationItem(new ValueItem(77), '+', new ValueItem(53503));
+                OperationItem* pB = new OperationItem(new ValueItem(8630), ':', new ValueItem(88));
+                OperationItem* pC = new OperationItem(pA, ':', pB);
+                OperationItem* pD = new OperationItem(pC, ':', new ValueItem(12));
+                _tprintf(_T("pD->AsString() %s\n"), pD->AsString());
+                pD->AsString();
+        }
+        #endif // defined(_DEBUG)
+        #pragma endregion
         srand(1);
         for(INT nCount = 0; nCount < 1000; nCount++)