WIP step 7

Validation complete avec ancien format
KhiopsML · Nov 28, 2023 · d3a3a68 · d3a3a68
1 parent d8c7089
commit d3a3a68
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/Learning/KWData/KWTime.cpp b/src/Learning/KWData/KWTime.cpp
@@ -641,7 +641,7 @@ const char* const KWTimeFormat::TimeToString(Time tmValue) const
 {
 	char* sBuffer = StandardGetBuffer();
 	int nOffset;
-	const double dEpsilon = 1e-5;
+	const double dEpsilon = 0.5 / DateTime::nMaxFracSeconds;
 	int nSecond;
 	int nSecondFrac;
 	int i;
@@ -709,11 +709,12 @@ const char* const KWTimeFormat::TimeToString(Time tmValue) const
 			// Ecriture des fractions de secondes
 			if (nSecondFrac > 0)
 			{
-				nOffset += snprintf(sBuffer + nOffset, BUFFER_LENGTH - nOffset, ".%04d", nSecondFrac);
+				nOffset += snprintf(sBuffer + nOffset, BUFFER_LENGTH - nOffset, ".%0*d",
+						    DateTime::nFracSecondsDigitNumber, nSecondFrac);
 
 				// Supression des zero en fin pour ne garder que la partie utile des decimales de
 				// secondes
-				for (i = 0; i < 4; i++)
+				for (i = 0; i < DateTime::nFracSecondsDigitNumber; i++)
 				{
 					if (sBuffer[nOffset - 1 - i] == '0')
 						sBuffer[nOffset - 1 - i] = '\0';

diff --git a/src/Learning/KWData/KWTime.h b/src/Learning/KWData/KWTime.h
@@ -383,7 +383,7 @@ inline void Time::SetMinute(int nValue)
 
 inline void Time::SetSecond(double dValue)
 {
-	const double dEpsilon = 1e-5;
+	const double dEpsilon = 0.5 / DateTime::nMaxFracSeconds;
 	int nSecond;
 	int nSecondFrac;
 	require(0 <= dValue and dValue < 60);

diff --git a/src/Learning/KWData/KWTimestamp.cpp b/src/Learning/KWData/KWTimestamp.cpp
@@ -199,10 +199,6 @@ 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("z_Work", "TimestampBUG");
+	SetWindowsDebugDir("Rules", "DateTimeRules");
 
 	// Parametrage des logs memoires depuis les variables d'environnement, pris en compte dans KWLearningProject
 	//   KhiopsMemStatsLogFileName, KhiopsMemStatsLogFrequency, KhiopsMemStatsLogToCollect