Browse Source

improve GroupClassify algorithm.

gsp 3 years ago
parent
commit
205ba97992
1 changed files with 4 additions and 4 deletions
  1. 4 4
      OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.cpp

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

@@ -381,21 +381,21 @@ namespace OTSClassifyEngine
 		}
 		}
 
 
 	
 	
-		if (dOMolar > MIN_ELEMENT_SUM && dSMolar< MIN_ELEMENT_SUM && dNMolar< MIN_ELEMENT_SUM)
+		if (dOMolar >= MIN_ELEMENT_SUM && dSMolar< MIN_ELEMENT_SUM )
 		{
 		{
 			
 			
 			a_GrpId = IDENTIFIED_INC_GRP_ID::OXIDE;
 			a_GrpId = IDENTIFIED_INC_GRP_ID::OXIDE;
 			
 			
 		}
 		}
-		else if (dOMolar < MIN_ELEMENT_SUM && dSMolar > MIN_ELEMENT_SUM && dNMolar < MIN_ELEMENT_SUM)
+		else if ( dSMolar >= MIN_ELEMENT_SUM && dOMolar < MIN_ELEMENT_SUM)
 		{
 		{
 			a_GrpId = IDENTIFIED_INC_GRP_ID::SULFIDE;
 			a_GrpId = IDENTIFIED_INC_GRP_ID::SULFIDE;
 		}
 		}
-		else if (dOMolar > MIN_ELEMENT_SUM && dSMolar > MIN_ELEMENT_SUM && dNMolar < MIN_ELEMENT_SUM)
+		else if (dOMolar >= MIN_ELEMENT_SUM && dSMolar > MIN_ELEMENT_SUM )
 		{
 		{
 			a_GrpId = IDENTIFIED_INC_GRP_ID::SULFIDE_OXIDE;
 			a_GrpId = IDENTIFIED_INC_GRP_ID::SULFIDE_OXIDE;
 		}
 		}
-		else if ( dNMolar > MIN_ELEMENT_SUM)
+		else if ( dNMolar >= MIN_ELEMENT_SUM)
 		{
 		{
 			a_GrpId = IDENTIFIED_INC_GRP_ID::CARBONNITRIDE_NITRIDE;
 			a_GrpId = IDENTIFIED_INC_GRP_ID::CARBONNITRIDE_NITRIDE;
 		}
 		}