WIP step 6

Correction pour tests complets sur LearningTest
KhiopsML · Nov 28, 2023 · d8c7089 · d8c7089
1 parent a0e1d7a
commit d8c7089
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Learning/KWData/KWTime.cpp b/src/Learning/KWData/KWTime.cpp
@@ -536,7 +536,7 @@ Time KWTimeFormat::StringToTime(const char* const sValue) const
 
 				// On ne prend en compte que les decimales utiles de la fraction de secondes
 				nUnit /= 10;
-				if (bCheck and nUnit == 0)
+				if (bCheck and nUnit > 0)
 					nSecondFrac += nUnit * (cChar0 - '0');
 				else
 					break;
@@ -621,7 +621,7 @@ Time KWTimeFormat::StringToTime(const char* const sValue) const
 
 					// On ne prend en compte que les decimales utiles de la fraction de secondes
 					nUnit /= 10;
-					if (bCheck and nUnit == 0)
+					if (bCheck and nUnit > 0)
 						nSecondFrac += nUnit * (cChar0 - '0');
 					else
 						break;

diff --git a/src/Learning/KWData/KWTimestamp.cpp b/src/Learning/KWData/KWTimestamp.cpp
@@ -199,6 +199,10 @@ void Timestamp::Test()
 	int nTotalLeapDayNumber;
 	int nTotalSecondNumber;
 
+	//DDD
+	tsCurrent.Init(2012, 01, 01, 21, 38, 20.3);
+	cout << "BUG: " << tsCurrent.ToString() << endl;
+
 	cout << "sizeof(Timestamp): " << sizeof(Timestamp) << endl;
 	//DDD assert(sizeof(Timestamp) == sizeof(Date) + sizeof(Time));
 	assert(sizeof(Timestamp) == sizeof(longint));

diff --git a/src/Learning/MODL/MODL.cpp b/src/Learning/MODL/MODL.cpp
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
 	// Choix du repertoire de lancement pour le debugage sous Windows (a commenter apres fin du debug)
 	// SetWindowsDebugDir("Standard", "IrisLight");
 	// SetWindowsDebugDir("Standard", "Iris2D");
-	SetWindowsDebugDir("Rules", "DateTimeRules");
+	SetWindowsDebugDir("z_Work", "TimestampBUG");
 
 	// Parametrage des logs memoires depuis les variables d'environnement, pris en compte dans KWLearningProject
 	//   KhiopsMemStatsLogFileName, KhiopsMemStatsLogFrequency, KhiopsMemStatsLogToCollect