Browse Source

add Ca-Aluminate of classify items

CXS 3 năm trước cách đây
mục cha
commit
b8e02dd7a1

BIN
Bin/x64/Debug/Config/SysData/IncSysLib/IncASTDData.db


+ 2 - 2
OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.cpp

@@ -2100,7 +2100,7 @@ namespace OTSClassifyEngine
 		{
 			CElementChemistryPtr pKeyElChem2 = GetNamedElementChemistry(a_listElChems, ALUMINATE_KEY_ELEMENT_NAME[1]);
 
-			if (!pKeyElChem2)
+			if (!pKeyElChem2|| pKeyElChem2->GetPercentage()< MIN_ELEMENT_SUM)
 			{
 				strName = ALUMINATE_STR;
 				return TRUE;
@@ -2123,7 +2123,7 @@ namespace OTSClassifyEngine
 			}
 			else
 			{
-				strName = ALUMINATE_STR;
+				strName = Ca_ALUMINATE_STR;
 			}
 			
 			// this is a Aluminate, return TRUE

+ 2 - 2
OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.h

@@ -108,8 +108,8 @@ namespace OTSClassifyEngine
 	const double ALUMINAT_KEY_ELEMENT_MOLAR_TOTAL_MAX = 90.0;
 	const CString ALUMINATE12CaO_7Al2O3_STR = _T("12CaO-7Al2O3");
 	const CString ALUMINATE3CaO_Al2O3_STR = _T("3CaO-Al2O3");
-	const CString ALUMINATE_STR = _T("Ca-Aluminate");
-
+	const CString ALUMINATE_STR = _T("Aluminate");
+	const CString Ca_ALUMINATE_STR = _T("Ca-Aluminate");
 
 	const CString STR_OXIDE = _T("O");
 	const double MIN_OXIDE_MOLAR = 5.0;