diff --git a/src/Learning/KWDataPreparation/KWAttributeStats.cpp b/src/Learning/KWDataPreparation/KWAttributeStats.cpp index 7cd4c6875..6160100b3 100644 --- a/src/Learning/KWDataPreparation/KWAttributeStats.cpp +++ b/src/Learning/KWDataPreparation/KWAttributeStats.cpp @@ -269,14 +269,14 @@ void KWAttributeStats::WriteHeaderLineReport(ostream& ost) ost << "\tTarget intervals"; else if (GetTargetAttributeType() == KWType::Symbol and IsTargetGrouped()) ost << "\tTarget groups"; - - // Nombre de parties sources - if (nAttributeType == KWType::Continuous) - ost << "\tIntervals"; - else if (nAttributeType == KWType::Symbol) - ost << "\tGroups"; } + // Nombre de parties sources, y compris en non supervise + if (nAttributeType == KWType::Continuous) + ost << "\tIntervals"; + else if (nAttributeType == KWType::Symbol) + ost << "\tGroups"; + // Statistiques descriptives ost << "\t"; kwDescriptiveStats->WriteHeaderLineReport(ost); @@ -330,7 +330,7 @@ void KWAttributeStats::WriteLineReport(ostream& ost) // Initialisation nSource = -1; - // Evaluation de la variable si discretisation pertinente + // Evaluation de la variable si discretisation ou groupement pertinente // dans le cas supervise uniquement if (GetTargetAttributeName() != "") { @@ -368,6 +368,23 @@ void KWAttributeStats::WriteLineReport(ostream& ost) ost << "\t1"; } } + // Nombre de partie uniquement dans le cas supervise + else + { + assert(GetTargetAttributeName() != ""); + + if (GetPreparedDataGridStats() != NULL) + { + assert(GetPreparedDataGridStats()->GetAttributeNumber() == 1); + + ost << "\t" << GetPreparedDataGridStats()->GetAttributeAt(0)->GetPartNumber(); + } + // Pas d'infos sinon + else + { + ost << "\t1"; + } + } // Statistiques descriptives ost << "\t"; @@ -442,7 +459,7 @@ void KWAttributeStats::WriteJSONArrayFields(JSONFile* fJSON, boolean bSummary) // Initialisation nSource = -1; - // Evaluation de la variable si discretisation pertinente + // Evaluation de la variable si discretisation ou groupement pertinent // dans le cas supervise uniquement if (GetTargetAttributeName() != "") { @@ -488,6 +505,17 @@ void KWAttributeStats::WriteJSONArrayFields(JSONFile* fJSON, boolean bSummary) fJSON->WriteKeyInt("parts", 1); } } + // Dans le cas non supervise, on ecrit eventuellement le nombre de parties + else + { + assert(GetTargetAttributeName() != ""); + if (GetPreparedDataGridStats() != NULL) + { + assert(GetPreparedDataGridStats()->GetAttributeNumber() == 1); + fJSON->WriteKeyInt("parts", + GetPreparedDataGridStats()->GetAttributeAt(0)->GetPartNumber()); + } + } // Statistiques descriptives kwDescriptiveStats->WriteJSONFields(fJSON); @@ -550,7 +578,7 @@ void KWAttributeStats::WriteJSONArrayFields(JSONFile* fJSON, boolean bSummary) { descriptiveContinuousStats = cast(KWDescriptiveContinuousStats*, GetDescriptiveStats()); - // On prend les bornes issues de l'histogramme dans le cas d'un discretisation non + // On prend les bornes issues de l'histogramme dans le cas d'une discretisation non // supervisee MODL if (modlHistogramResults != NULL) { diff --git a/src/Learning/MHHistograms/MHMODLHistogramAnalysisStats.cpp b/src/Learning/MHHistograms/MHMODLHistogramAnalysisStats.cpp index 00de9ecac..a472c4ad1 100644 --- a/src/Learning/MHHistograms/MHMODLHistogramAnalysisStats.cpp +++ b/src/Learning/MHHistograms/MHMODLHistogramAnalysisStats.cpp @@ -142,10 +142,6 @@ void MHMODLHistogramAnalysisStats::WriteJSONKeyReport(JSONFile* fJSON, const ALS // Nombre d'histogramms interpretables fJSON->WriteKeyInt("interpretableHistogramNumber", GetInterpretableHistogramNumber()); - // Central bin exponents, pour les histogrammes interpretables, et pour le dernier - fJSON->WriteKeyInt("centralBinExponent", GetCentralBinExponent()); - fJSON->WriteKeyInt("lastCentralBinExponent", GetLastCentralBinExponent()); - // Epsilon de troncature fJSON->WriteKeyContinuous("truncationEpsilon", GetTruncationEpsilon()); diff --git a/src/Learning/MODL/MODL.cpp b/src/Learning/MODL/MODL.cpp index 00afe053d..c745e3827 100644 --- a/src/Learning/MODL/MODL.cpp +++ b/src/Learning/MODL/MODL.cpp @@ -36,7 +36,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("TextVariables", "TextLoadFile"); + SetWindowsDebugDir("Standard", "IrisLightWithTrees"); // Parametrage des logs memoires depuis les variables d'environnement, pris en compte dans KWLearningProject // KhiopsMemStatsLogFileName, KhiopsMemStatsLogFrequency, KhiopsMemStatsLogToCollect diff --git a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.Preparation2DReport.xls b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.Preparation2DReport.xls index 13f7eaabe..f1db85907 100644 --- a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.Preparation2DReport.xls +++ b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.Preparation2DReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.PreparationReport.xls index 64abcac16..9c2d449e5 100644 --- a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics @@ -34,24 +34,24 @@ Value grouping MODL Categorical variables statistics -Rank Name Values Mode Mode coverage Missing number Sparse missing number Constr. cost Derivation rule -R01 Class 3 Iris-setosa 0.361905 0 0 3.17805 -R02 Class1 2 0.638095 67 0 3.17805 IfC(EQc(Class, "Iris-setosa"), "setosa", "") -R03 Class2 2 0.695238 73 0 3.17805 IfC(EQc(Class, "Iris-versicolor"), "versicolor", "") -R09 SPetalLength 5 1 0.361905 0 0 3.17805 AsCategorical(Floor(PetalLength)) +Rank Name Groups Values Mode Mode coverage Missing number Sparse missing number Constr. cost Derivation rule +R01 Class 3 3 Iris-setosa 0.361905 0 0 3.17805 +R02 Class1 2 2 0.638095 67 0 3.17805 IfC(EQc(Class, "Iris-setosa"), "setosa", "") +R03 Class2 2 2 0.695238 73 0 3.17805 IfC(EQc(Class, "Iris-versicolor"), "versicolor", "") +R09 SPetalLength 5 5 1 0.361905 0 0 3.17805 AsCategorical(Floor(PetalLength)) Numerical variables statistics -Rank Name Values Min Max Mean Std dev Missing number Sparse missing number Constr. cost Derivation rule -R04 Dummy1 1 0 0 0 0 0 0 3.17805 Copy(0) -R05 Dummy2 105 0.005121241265 0.9859650261 0.5173966838 0.2650019122 0 0 3.17805 Random() -R06 LowerPetalLength 10 1 3 2.446666667 0.7433600251 0 0 3.17805 If(LE(PetalLength, 3), PetalLength, 3) -R07 PetalLength 36 1 6.9 3.686666667 1.80132579 0 0 3.17805 -R08 PetalWidth 21 0.1 2.5 1.175238095 0.7880996979 0 0 3.17805 -R10 SepalLength 31 4.3 7.7 5.827619048 0.8375127846 0 0 3.17805 -R11 SepalWidth 23 2 4.4 3.081904762 0.4284592446 0 0 3.17805 -R12 UpperPetalWidth 11 1.5 2.5 1.692380952 0.2962287527 0 0 3.17805 If(GE(PetalWidth, 1.5), PetalWidth, 1.5) +Rank Name Intervals Values Min Max Mean Std dev Missing number Sparse missing number Constr. cost Derivation rule +R04 Dummy1 1 1 0 0 0 0 0 0 3.17805 Copy(0) +R05 Dummy2 1 105 0.005121241265 0.9859650261 0.5173966838 0.2650019122 0 0 3.17805 Random() +R06 LowerPetalLength 4 10 1 3 2.446666667 0.7433600251 0 0 3.17805 If(LE(PetalLength, 3), PetalLength, 3) +R07 PetalLength 5 36 1 6.9 3.686666667 1.80132579 0 0 3.17805 +R08 PetalWidth 5 21 0.1 2.5 1.175238095 0.7880996979 0 0 3.17805 +R10 SepalLength 2 31 4.3 7.7 5.827619048 0.8375127846 0 0 3.17805 +R11 SepalWidth 3 23 2 4.4 3.081904762 0.4284592446 0 0 3.17805 +R12 UpperPetalWidth 2 11 1.5 2.5 1.692380952 0.2962287527 0 0 3.17805 If(GE(PetalWidth, 1.5), PetalWidth, 1.5) -------------------------------------------------------------------------------- diff --git a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.khj index bfc1926d9..f76956d8e 100644 --- a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "preparationReport": { "reportType": "Preparation", @@ -40,6 +40,7 @@ "rank": "R01", "name": "Class", "type": "Categorical", + "parts": 3, "values": 3, "mode": "Iris-setosa", "modeFrequency": 38, @@ -51,6 +52,7 @@ "rank": "R02", "name": "Class1", "type": "Categorical", + "parts": 2, "values": 2, "mode": "", "modeFrequency": 67, @@ -63,6 +65,7 @@ "rank": "R03", "name": "Class2", "type": "Categorical", + "parts": 2, "values": 2, "mode": "", "modeFrequency": 73, @@ -75,6 +78,7 @@ "rank": "R04", "name": "Dummy1", "type": "Numerical", + "parts": 1, "values": 1, "min": 0, "max": 0, @@ -89,6 +93,7 @@ "rank": "R05", "name": "Dummy2", "type": "Numerical", + "parts": 1, "values": 105, "min": 0.005121241265, "max": 0.9859650261, @@ -103,6 +108,7 @@ "rank": "R06", "name": "LowerPetalLength", "type": "Numerical", + "parts": 4, "values": 10, "min": 1, "max": 3, @@ -117,6 +123,7 @@ "rank": "R07", "name": "PetalLength", "type": "Numerical", + "parts": 5, "values": 36, "min": 1, "max": 6.9, @@ -130,6 +137,7 @@ "rank": "R08", "name": "PetalWidth", "type": "Numerical", + "parts": 5, "values": 21, "min": 0.1, "max": 2.5, @@ -143,6 +151,7 @@ "rank": "R09", "name": "SPetalLength", "type": "Categorical", + "parts": 5, "values": 5, "mode": "1", "modeFrequency": 38, @@ -155,6 +164,7 @@ "rank": "R10", "name": "SepalLength", "type": "Numerical", + "parts": 2, "values": 31, "min": 4.3, "max": 7.7, @@ -168,6 +178,7 @@ "rank": "R11", "name": "SepalWidth", "type": "Numerical", + "parts": 3, "values": 23, "min": 2, "max": 4.4, @@ -181,6 +192,7 @@ "rank": "R12", "name": "UpperPetalWidth", "type": "Numerical", + "parts": 2, "values": 11, "min": 1.5, "max": 2.5, @@ -278,8 +290,6 @@ "modlHistograms": { "histogramNumber": 1, "interpretableHistogramNumber": 1, - "centralBinExponent": 0, - "lastCentralBinExponent": 0, "truncationEpsilon": 0, "removedSingularIntervalNumber": 0, "granularities": [0], @@ -318,8 +328,6 @@ "modlHistograms": { "histogramNumber": 5, "interpretableHistogramNumber": 4, - "centralBinExponent": 2, - "lastCentralBinExponent": 2, "truncationEpsilon": 0.1, "removedSingularIntervalNumber": 0, "granularities": [0,2,3,5,28], @@ -375,8 +383,6 @@ "modlHistograms": { "histogramNumber": 5, "interpretableHistogramNumber": 4, - "centralBinExponent": 4, - "lastCentralBinExponent": 3, "truncationEpsilon": 0.1, "removedSingularIntervalNumber": 0, "granularities": [0,3,5,7,29], @@ -432,8 +438,6 @@ "modlHistograms": { "histogramNumber": 5, "interpretableHistogramNumber": 4, - "centralBinExponent": -3, - "lastCentralBinExponent": -4, "truncationEpsilon": 0.1, "removedSingularIntervalNumber": 0, "granularities": [0,1,2,3,30], @@ -511,8 +515,6 @@ "modlHistograms": { "histogramNumber": 2, "interpretableHistogramNumber": 2, - "centralBinExponent": 2, - "lastCentralBinExponent": 2, "truncationEpsilon": 0, "removedSingularIntervalNumber": 0, "granularities": [0,2], @@ -554,8 +556,6 @@ "modlHistograms": { "histogramNumber": 4, "interpretableHistogramNumber": 3, - "centralBinExponent": 1, - "lastCentralBinExponent": 3, "truncationEpsilon": 0.1, "removedSingularIntervalNumber": 0, "granularities": [0,1,2,29], @@ -604,8 +604,6 @@ "modlHistograms": { "histogramNumber": 4, "interpretableHistogramNumber": 3, - "centralBinExponent": 2, - "lastCentralBinExponent": 2, "truncationEpsilon": 0.1, "removedSingularIntervalNumber": 0, "granularities": [0,1,5,28], diff --git a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/err.txt index 0e8a46c9e..4d8a1f992 100644 --- a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/err.txt @@ -1,6 +1,6 @@ Train unsupervised model Database ../../../datasets/Iris/Iris.txt: Read records: 150 Selected records: 105 Evaluation of variable pairs -Data preparation time: 0:00:00.31 +Data preparation time: 0:00:00.38 Write report ./results/AnalysisResults.khj diff --git a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/time.log b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/time.log index d11750ce1..867cc1a5e 100644 --- a/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard-unstable/IrisU2D/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.4437694549560547 +Overal time: 0.9410936832427979 diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.ModelingReport.xls index b7ca9bc60..2b281e412 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Adult diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.PreparationReport.xls index ab92616bc..be43a2dfa 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.TestEvaluationReport.xls index 910d2b23a..38153c6b2 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Adult diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.TrainEvaluationReport.xls index 5d817bc8c..cb3b1954b 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Adult diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.khj index 0047a1285..e24fc4cf7 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.model.kdic index ef6b36b63..8078e2e89 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary BU1_Adult diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/EvaluationReport.khj b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/EvaluationReport.khj index f40a4373f..493e0db62 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/EvaluationReport.khj +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/EvaluationReport.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "evaluationReport": { "reportType": "Evaluation", "evaluationType": "", diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/EvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/EvaluationReport.xls index 8b6cfc910..6706543c9 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/EvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/EvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Predictor evaluation report Dictionary Adult diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/err.txt index b687a2e59..a8bb37020 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/err.txt @@ -1,7 +1,7 @@ Train supervised model for classification of target variable class Database ../../../datasets/Adult/Adult.txt: Read records: 48,842 Selected records: 34,291 -Data preparation time: 0:00:00.30 -SNB train time: 0:00:00.68 +Data preparation time: 0:00:00.35 +SNB train time: 0:00:00.71 Build Selective Naive Bayes SNB_Adult Build Univariate BU1_Adult Train evaluation of Selective Naive Bayes on database ../../../datasets/Adult/Adult.txt @@ -13,7 +13,7 @@ Write report ./results/AnalysisResults.khj Deploy model SNB_Adult Input database ../../../datasets/Adult/Adult.txt: Read records: 48,842 Output database ./results/D_Adult.txt: Written records: 34,291 -Model deployment time: 0:00:00.09 +Model deployment time: 0:00:00.10 Predictor evaluation of Univariate relationship on database ../../../datasets/Adult/Adult.txt Predictor evaluation of Selective Naive Bayes on database ../../../datasets/Adult/Adult.txt diff --git a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/time.log index 93bbbe0a1..2db0babe1 100644 --- a/test/LearningTest/TestKhiops/Standard/Adult/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/Adult/results.ref/time.log @@ -1 +1 @@ -Overal time: 1.987966775894165 +Overal time: 1.893387794494629 diff --git a/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/AnalysisResults.PreparationReport.xls index 69a0d0141..42a9270e0 100644 --- a/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics @@ -32,28 +32,28 @@ Value grouping MODL Categorical variables statistics -Rank Name Values Mode Mode coverage Missing number Sparse missing number Constr. cost -R05 class 2 less 0.760718 0 0 3.46574 -R06 education 16 HS-grad 0.323164 0 0 3.46574 -R10 marital_status 7 Married-civ-spouse 0.458192 0 0 3.46574 -R11 native_country 41 United-States 0.914971 0 0 3.46574 -R12 occupation 14 Prof-specialty 0.183879 0 0 3.46574 -R13 race 5 White 0.855043 0 0 3.46574 -R14 relationship 6 Husband 0.403669 0 0 3.46574 -R15 sex 2 Male 0.668482 0 0 3.46574 -R16 workclass 8 Private 0.751505 0 0 3.46574 +Rank Name Groups Values Mode Mode coverage Missing number Sparse missing number Constr. cost +R05 class 2 2 less 0.760718 0 0 3.46574 +R06 education 16 16 HS-grad 0.323164 0 0 3.46574 +R10 marital_status 7 7 Married-civ-spouse 0.458192 0 0 3.46574 +R11 native_country 40 41 United-States 0.914971 0 0 3.46574 +R12 occupation 14 14 Prof-specialty 0.183879 0 0 3.46574 +R13 race 5 5 White 0.855043 0 0 3.46574 +R14 relationship 6 6 Husband 0.403669 0 0 3.46574 +R15 sex 2 2 Male 0.668482 0 0 3.46574 +R16 workclass 8 8 Private 0.751505 0 0 3.46574 Numerical variables statistics -Rank Name Values Min Max Mean Std dev Missing number Sparse missing number Constr. cost -R01 Label 48842 1 48842 24421.5 14099.47092 0 0 3.46574 -R02 age 74 17 90 38.64358544 13.71036958 0 0 3.46574 -R03 capital_gain 123 0 99999 1079.067626 7451.94277 0 0 3.46574 -R04 capital_loss 99 0 4356 87.50231358 403.0004265 0 0 3.46574 -R07 education_num 16 1 16 10.07808853 2.570946436 0 0 3.46574 -R08 fnlwgt 28523 12285 1490400 189664.1346 105602.9443 0 0 3.46574 -R09 hours_per_week 96 1 99 40.42238238 12.39131717 0 0 3.46574 +Rank Name Intervals Values Min Max Mean Std dev Missing number Sparse missing number Constr. cost +R01 Label 1 48842 1 48842 24421.5 14099.47092 0 0 3.46574 +R02 age 21 74 17 90 38.64358544 13.71036958 0 0 3.46574 +R03 capital_gain 38 123 0 99999 1079.067626 7451.94277 0 0 3.46574 +R04 capital_loss 51 99 0 4356 87.50231358 403.0004265 0 0 3.46574 +R07 education_num 16 16 1 16 10.07808853 2.570946436 0 0 3.46574 +R08 fnlwgt 1240 28523 12285 1490400 189664.1346 105602.9443 0 0 3.46574 +R09 hours_per_week 70 96 1 99 40.42238238 12.39131717 0 0 3.46574 -------------------------------------------------------------------------------- diff --git a/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/AnalysisResults.khj index 26077465c..99978e0a8 100644 --- a/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "preparationReport": { "reportType": "Preparation", @@ -38,6 +38,7 @@ "rank": "R01", "name": "Label", "type": "Numerical", + "parts": 1, "values": 48842, "min": 1, "max": 48842, @@ -51,6 +52,7 @@ "rank": "R02", "name": "age", "type": "Numerical", + "parts": 21, "values": 74, "min": 17, "max": 90, @@ -64,6 +66,7 @@ "rank": "R03", "name": "capital_gain", "type": "Numerical", + "parts": 38, "values": 123, "min": 0, "max": 99999, @@ -77,6 +80,7 @@ "rank": "R04", "name": "capital_loss", "type": "Numerical", + "parts": 51, "values": 99, "min": 0, "max": 4356, @@ -90,6 +94,7 @@ "rank": "R05", "name": "class", "type": "Categorical", + "parts": 2, "values": 2, "mode": "less", "modeFrequency": 37155, @@ -101,6 +106,7 @@ "rank": "R06", "name": "education", "type": "Categorical", + "parts": 16, "values": 16, "mode": "HS-grad", "modeFrequency": 15784, @@ -112,6 +118,7 @@ "rank": "R07", "name": "education_num", "type": "Numerical", + "parts": 16, "values": 16, "min": 1, "max": 16, @@ -125,6 +132,7 @@ "rank": "R08", "name": "fnlwgt", "type": "Numerical", + "parts": 1240, "values": 28523, "min": 12285, "max": 1490400, @@ -138,6 +146,7 @@ "rank": "R09", "name": "hours_per_week", "type": "Numerical", + "parts": 70, "values": 96, "min": 1, "max": 99, @@ -151,6 +160,7 @@ "rank": "R10", "name": "marital_status", "type": "Categorical", + "parts": 7, "values": 7, "mode": "Married-civ-spouse", "modeFrequency": 22379, @@ -162,6 +172,7 @@ "rank": "R11", "name": "native_country", "type": "Categorical", + "parts": 40, "values": 41, "mode": "United-States", "modeFrequency": 44689, @@ -173,6 +184,7 @@ "rank": "R12", "name": "occupation", "type": "Categorical", + "parts": 14, "values": 14, "mode": "Prof-specialty", "modeFrequency": 8981, @@ -184,6 +196,7 @@ "rank": "R13", "name": "race", "type": "Categorical", + "parts": 5, "values": 5, "mode": "White", "modeFrequency": 41762, @@ -195,6 +208,7 @@ "rank": "R14", "name": "relationship", "type": "Categorical", + "parts": 6, "values": 6, "mode": "Husband", "modeFrequency": 19716, @@ -206,6 +220,7 @@ "rank": "R15", "name": "sex", "type": "Categorical", + "parts": 2, "values": 2, "mode": "Male", "modeFrequency": 32650, @@ -217,6 +232,7 @@ "rank": "R16", "name": "workclass", "type": "Categorical", + "parts": 8, "values": 8, "mode": "Private", "modeFrequency": 36705, @@ -244,8 +260,6 @@ "modlHistograms": { "histogramNumber": 1, "interpretableHistogramNumber": 1, - "centralBinExponent": 16, - "lastCentralBinExponent": 16, "truncationEpsilon": 0, "removedSingularIntervalNumber": 0, "granularities": [0], @@ -301,8 +315,6 @@ "modlHistograms": { "histogramNumber": 9, "interpretableHistogramNumber": 8, - "centralBinExponent": 7, - "lastCentralBinExponent": 4, "truncationEpsilon": 1, "removedSingularIntervalNumber": 0, "granularities": [0,1,2,3,4,5,6,7,24], @@ -407,8 +419,6 @@ "modlHistograms": { "histogramNumber": 9, "interpretableHistogramNumber": 8, - "centralBinExponent": 6, - "lastCentralBinExponent": 6, "truncationEpsilon": 0, "removedSingularIntervalNumber": 88, "granularities": [0,1,2,3,4,5,6,7,30], @@ -526,8 +536,6 @@ "modlHistograms": { "histogramNumber": 12, "interpretableHistogramNumber": 11, - "centralBinExponent": 13, - "lastCentralBinExponent": 7, "truncationEpsilon": 1, "removedSingularIntervalNumber": 25, "granularities": [0,1,2,3,4,5,6,7,8,9,10,30], @@ -680,8 +688,6 @@ "modlHistograms": { "histogramNumber": 6, "interpretableHistogramNumber": 5, - "centralBinExponent": 4, - "lastCentralBinExponent": 4, "truncationEpsilon": 1, "removedSingularIntervalNumber": 0, "granularities": [0,1,2,3,4,24], @@ -1976,8 +1982,6 @@ "modlHistograms": { "histogramNumber": 20, "interpretableHistogramNumber": 19, - "centralBinExponent": 16, - "lastCentralBinExponent": 13, "truncationEpsilon": 1, "removedSingularIntervalNumber": 3, "granularities": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,25], @@ -2158,8 +2162,6 @@ "modlHistograms": { "histogramNumber": 9, "interpretableHistogramNumber": 8, - "centralBinExponent": 7, - "lastCentralBinExponent": 7, "truncationEpsilon": 1, "removedSingularIntervalNumber": 0, "granularities": [0,1,2,3,4,5,6,7,25], diff --git a/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/err.txt index 358e8dfe8..a731fb66a 100644 --- a/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/err.txt @@ -1,5 +1,5 @@ Train unsupervised model Database ../../../datasets/Adult/Adult.txt: Read records: 48,842 -Data preparation time: 0:00:02.49 +Data preparation time: 0:00:02.34 Write report ./results/AnalysisResults.khj diff --git a/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/time.log index 2e8118737..f849c0d2c 100644 --- a/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/AdultU/results.ref/time.log @@ -1 +1 @@ -Overal time: 2.631314754486084 +Overal time: 2.486985921859741 diff --git a/test/LearningTest/TestKhiops/Standard/BenchIris/results.ref/benchmark.xls b/test/LearningTest/TestKhiops/Standard/BenchIris/results.ref/benchmark.xls index d364f4127..2c2aa3ab1 100644 --- a/test/LearningTest/TestKhiops/Standard/BenchIris/results.ref/benchmark.xls +++ b/test/LearningTest/TestKhiops/Standard/BenchIris/results.ref/benchmark.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Predictor evaluation report @@ -117,16 +117,16 @@ SignificantTests 0/1/0 1/0/0 0/0/1 0/0/1 Rank 3 4 2 1 Total Time SNB NB DG BU -Mean 0.0285 0.0188 0.0487 0.0191 -GeometricMean 0.0269697 0.0187957 0.0486658 0.0190549 -SignificantTests 0/1/0 0/0/1 1/0/0 0/0/1 +Mean 0.0285 0.0194 0.0528 0.0208 +GeometricMean 0.0265982 0.0193939 0.0527533 0.020696 +SignificantTests 0/1/0 0/1/0 1/0/0 0/1/0 Rank 3 1 4 2 Pre Time SNB NB DG BU -Mean 0.0239 0.0188 0.0184 0.0191 -GeometricMean 0.0222341 0.0187957 0.0183884 0.0190549 +Mean 0.024 0.0194 0.0203 0.0208 +GeometricMean 0.0219321 0.0193939 0.0202667 0.020696 SignificantTests 0/1/0 0/1/0 0/1/0 0/1/0 -Rank 4 2 1 3 +Rank 4 1 2 3 Experiment details @@ -214,12 +214,12 @@ Iris 2 0 0 4 0 1 1.3 0.458258 -1 1 0 -1 Total Time Dataset SNB NB DG BU Mean StandardDeviation SignificantTests Mean StandardDeviation SignificantTests Mean StandardDeviation SignificantTests Mean StandardDeviation SignificantTests -Iris 0.0285 0.0119436 0 0.0188 0.0004 -1 0.0487 0.00184662 1 0.0191 0.00137477 -1 +Iris 0.0285 0.0138365 0 0.0194 0.000489898 0 0.0528 0.00222711 1 0.0208 0.00218174 0 Pre Time Dataset SNB NB DG BU Mean StandardDeviation SignificantTests Mean StandardDeviation SignificantTests Mean StandardDeviation SignificantTests Mean StandardDeviation SignificantTests -Iris 0.0239 0.0117852 0 0.0188 0.0004 0 0.0184 0.000663325 0 0.0191 0.00137477 0 +Iris 0.024 0.0136748 0 0.0194 0.000489898 0 0.0203 0.00118743 0 0.0208 0.00218174 0 Run details @@ -434,26 +434,26 @@ Iris 10 2 4 1 1 Total Time Dataset Run SNB NB DG BU -Iris 1 0.064 0.019 0.047 0.018 -Iris 2 0.024 0.019 0.047 0.019 -Iris 3 0.025 0.019 0.052 0.023 -Iris 4 0.029 0.019 0.048 0.018 -Iris 5 0.023 0.019 0.048 0.019 -Iris 6 0.025 0.019 0.047 0.019 -Iris 7 0.024 0.018 0.052 0.019 -Iris 8 0.024 0.019 0.048 0.019 -Iris 9 0.024 0.019 0.05 0.019 -Iris 10 0.023 0.018 0.048 0.018 +Iris 1 0.07 0.019 0.057 0.02 +Iris 2 0.024 0.019 0.051 0.019 +Iris 3 0.024 0.02 0.055 0.02 +Iris 4 0.024 0.019 0.053 0.02 +Iris 5 0.024 0.019 0.052 0.02 +Iris 6 0.024 0.019 0.049 0.02 +Iris 7 0.024 0.02 0.055 0.02 +Iris 8 0.023 0.019 0.052 0.019 +Iris 9 0.024 0.02 0.053 0.026 +Iris 10 0.024 0.02 0.051 0.024 Pre Time Dataset Run SNB NB DG BU -Iris 1 0.059 0.019 0.018 0.018 -Iris 2 0.02 0.019 0.018 0.019 -Iris 3 0.02 0.019 0.02 0.023 -Iris 4 0.024 0.019 0.018 0.018 -Iris 5 0.019 0.019 0.018 0.019 -Iris 6 0.02 0.019 0.019 0.019 -Iris 7 0.019 0.018 0.019 0.019 -Iris 8 0.02 0.019 0.018 0.019 -Iris 9 0.019 0.019 0.018 0.019 -Iris 10 0.019 0.018 0.018 0.018 +Iris 1 0.065 0.019 0.023 0.02 +Iris 2 0.02 0.019 0.02 0.019 +Iris 3 0.02 0.02 0.02 0.02 +Iris 4 0.019 0.019 0.022 0.02 +Iris 5 0.02 0.019 0.02 0.02 +Iris 6 0.019 0.019 0.019 0.02 +Iris 7 0.02 0.02 0.02 0.02 +Iris 8 0.019 0.019 0.02 0.019 +Iris 9 0.019 0.02 0.019 0.026 +Iris 10 0.019 0.02 0.02 0.024 diff --git a/test/LearningTest/TestKhiops/Standard/BenchIris/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/BenchIris/results.ref/time.log index 439531260..238376d27 100644 --- a/test/LearningTest/TestKhiops/Standard/BenchIris/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/BenchIris/results.ref/time.log @@ -1 +1 @@ -Overal time: 1.8771882057189941 +Overal time: 1.9803194999694824 diff --git a/test/LearningTest/TestKhiops/Standard/BenchUnivariateIris/results.ref/benchmark.xls b/test/LearningTest/TestKhiops/Standard/BenchUnivariateIris/results.ref/benchmark.xls index 4165b3c2b..9437c7d7f 100644 --- a/test/LearningTest/TestKhiops/Standard/BenchUnivariateIris/results.ref/benchmark.xls +++ b/test/LearningTest/TestKhiops/Standard/BenchUnivariateIris/results.ref/benchmark.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Predictor evaluation report @@ -119,14 +119,14 @@ SignificantTests 0/4/0 0/4/0 Rank 1 1 Total Time MODL MODL_2 -Mean 0.00480153 0.00449023 -GeometricMean 0.00479343 0.00449016 +Mean 0.0060459 0.00476354 +GeometricMean 0.00593088 0.00476347 SignificantTests 0/4/0 0/4/0 Rank 2 1 Pre Time MODL MODL_2 -Mean 0.00480153 0.00449023 -GeometricMean 0.00479343 0.00449016 +Mean 0.0060459 0.00476354 +GeometricMean 0.00593088 0.00476347 SignificantTests 0/4/0 0/4/0 Rank 2 1 @@ -242,14 +242,14 @@ SignificantTests 0/4/0 0/4/0 Rank 1 1 Total Time MODL MODL_2 -Mean 0.00480153 0.00449023 -GeometricMean 0.00479343 0.00449016 +Mean 0.0060459 0.00476354 +GeometricMean 0.00593088 0.00476347 SignificantTests 0/4/0 0/4/0 Rank 2 1 Pre Time MODL MODL_2 -Mean 0.00480153 0.00449023 -GeometricMean 0.00479343 0.00449016 +Mean 0.0060459 0.00476354 +GeometricMean 0.00593088 0.00476347 SignificantTests 0/4/0 0/4/0 Rank 2 1 @@ -399,18 +399,18 @@ Iris PetalWidth 1 0 0 1 0 0 Total Time Dataset Attribute MODL MODL_2 Mean StandardDeviation SignificantTests Mean StandardDeviation SignificantTests -Iris SepalLength 0.00480153 0.00027875 0 0.00449023 2.42e-05 0 -Iris SepalWidth 0.00480153 0.00027875 0 0.00449023 2.42e-05 0 -Iris PetalLength 0.00480153 0.00027875 0 0.00449023 2.42e-05 0 -Iris PetalWidth 0.00480153 0.00027875 0 0.00449023 2.42e-05 0 +Iris SepalLength 0.0060459 0.00117368 0 0.00476354 2.45375e-05 0 +Iris SepalWidth 0.0060459 0.00117368 0 0.00476354 2.45375e-05 0 +Iris PetalLength 0.0060459 0.00117368 0 0.00476354 2.45375e-05 0 +Iris PetalWidth 0.0060459 0.00117368 0 0.00476354 2.45375e-05 0 Pre Time Dataset Attribute MODL MODL_2 Mean StandardDeviation SignificantTests Mean StandardDeviation SignificantTests -Iris SepalLength 0.00480153 0.00027875 0 0.00449023 2.42e-05 0 -Iris SepalWidth 0.00480153 0.00027875 0 0.00449023 2.42e-05 0 -Iris PetalLength 0.00480153 0.00027875 0 0.00449023 2.42e-05 0 -Iris PetalWidth 0.00480153 0.00027875 0 0.00449023 2.42e-05 0 +Iris SepalLength 0.0060459 0.00117368 0 0.00476354 2.45375e-05 0 +Iris SepalWidth 0.0060459 0.00117368 0 0.00476354 2.45375e-05 0 +Iris PetalLength 0.0060459 0.00117368 0 0.00476354 2.45375e-05 0 +Iris PetalWidth 0.0060459 0.00117368 0 0.00476354 2.45375e-05 0 Clusters Dataset Attribute MODL MODL_2 @@ -609,25 +609,25 @@ Iris PetalWidth 2 1 1 Total Time Dataset Attribute Run MODL MODL_2 -Iris SepalLength 1 0.00508028 0.00446603 -Iris SepalLength 2 0.00452278 0.00451442 -Iris SepalWidth 1 0.00508028 0.00446603 -Iris SepalWidth 2 0.00452278 0.00451442 -Iris PetalLength 1 0.00508028 0.00446603 -Iris PetalLength 2 0.00452278 0.00451442 -Iris PetalWidth 1 0.00508028 0.00446603 -Iris PetalWidth 2 0.00452278 0.00451442 +Iris SepalLength 1 0.00721958 0.00478808 +Iris SepalLength 2 0.00487222 0.004739 +Iris SepalWidth 1 0.00721958 0.00478808 +Iris SepalWidth 2 0.00487222 0.004739 +Iris PetalLength 1 0.00721958 0.00478808 +Iris PetalLength 2 0.00487222 0.004739 +Iris PetalWidth 1 0.00721958 0.00478808 +Iris PetalWidth 2 0.00487222 0.004739 Pre Time Dataset Attribute Run MODL MODL_2 -Iris SepalLength 1 0.00508028 0.00446603 -Iris SepalLength 2 0.00452278 0.00451442 -Iris SepalWidth 1 0.00508028 0.00446603 -Iris SepalWidth 2 0.00452278 0.00451442 -Iris PetalLength 1 0.00508028 0.00446603 -Iris PetalLength 2 0.00452278 0.00451442 -Iris PetalWidth 1 0.00508028 0.00446603 -Iris PetalWidth 2 0.00452278 0.00451442 +Iris SepalLength 1 0.00721958 0.00478808 +Iris SepalLength 2 0.00487222 0.004739 +Iris SepalWidth 1 0.00721958 0.00478808 +Iris SepalWidth 2 0.00487222 0.004739 +Iris PetalLength 1 0.00721958 0.00478808 +Iris PetalLength 2 0.00487222 0.004739 +Iris PetalWidth 1 0.00721958 0.00478808 +Iris PetalWidth 2 0.00487222 0.004739 Clusters Dataset Attribute Run MODL MODL_2 diff --git a/test/LearningTest/TestKhiops/Standard/BenchUnivariateIris/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/BenchUnivariateIris/results.ref/time.log index 0146be70f..2027bc6b7 100644 --- a/test/LearningTest/TestKhiops/Standard/BenchUnivariateIris/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/BenchUnivariateIris/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.49838709831237793 +Overal time: 0.5580630302429199 diff --git a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.ModelingReport.xls index 6011b56a4..388e2b758 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.PreparationReport.xls index 3eb85b621..6ebebea97 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.TestEvaluationReport.xls index 3d3474e0a..bf8c93eec 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.TrainEvaluationReport.xls index 7def1d54c..455a9cd79 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.khj index 38701dbe0..9b9ee0cba 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.model.kdic index bde64d900..3b3570365 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary BU1_Iris diff --git a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/time.log index fa3f9e231..98299e70a 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/Iris/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.23929762840270996 +Overal time: 0.24688458442687988 diff --git a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.ModelingReport.xls index 317eaf70c..843541e04 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.Preparation2DReport.xls b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.Preparation2DReport.xls index 8fb594bcf..04ea0b65f 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.Preparation2DReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.Preparation2DReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.PreparationReport.xls index 03f296d2f..521bb1791 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.TestEvaluationReport.xls index e6c639005..5c874db10 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.TrainEvaluationReport.xls index 1ee2ef7a3..da8185091 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.khj index f2cad387f..60833659a 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.model.kdic index dd03a3e8c..a873cf96d 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary BU1_Iris diff --git a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/err.txt index f4f455f14..e437a50bf 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/err.txt @@ -1,7 +1,7 @@ Train supervised model for classification of target variable Class Database ../../../datasets/Iris/Iris.txt: Read records: 150 Selected records: 105 Evaluation of variable pairs -Data preparation time: 0:00:00.52 +Data preparation time: 0:00:00.55 SNB train time: 0:00:00 Build Selective Naive Bayes SNB_Iris Build Univariate BU1_Iris diff --git a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/time.log index 76c13ef54..4584106bf 100644 --- a/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/Iris2D/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.7472364902496338 +Overal time: 0.797447681427002 diff --git a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.ModelingReport.xls index f8686be76..59bc1afff 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.PreparationReport.xls index b47a8438f..15e474463 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.TestEvaluationReport.xls index e6c639005..5c874db10 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.TrainEvaluationReport.xls index 1ee2ef7a3..da8185091 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.khj index ebd93aa52..6d56dc63a 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.model.kdic index 1392bf778..7435ed030 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary BU1_Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/time.log index ccf3e4dc2..87b861bf9 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/IrisC/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.26490068435668945 +Overal time: 0.2847154140472412 diff --git a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.ModelingReport.xls index 50fa09577..5f80cd90d 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.PreparationReport.xls index 3eb85b621..6ebebea97 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.TestEvaluationReport.xls index 5951af85f..ff93431c4 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.TrainEvaluationReport.xls index 6b67f9cf6..357af9856 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.khj index d15fdc6b7..0b57a9bb1 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.model.kdic index bc9e7a4cd..9e883aad9 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary SNB_Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/time.log index 82a5087fb..da7b293e8 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/IrisFastPath/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.21149301528930664 +Overal time: 0.20951175689697266 diff --git a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.ModelingReport.xls index 541061ea7..a3cd8a669 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.PreparationReport.xls index 522b1ccde..023d5e7eb 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.TestEvaluationReport.xls index 0410c2652..d04e01943 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.TrainEvaluationReport.xls index 5fdb154be..61bc0d6e2 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.khj index 7194c3f24..6df2ce07f 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.model.kdic index 2d75ee2fb..3a719ca20 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary BU1_Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/err.txt index adb1063bd..23c3cc0ad 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/err.txt @@ -1,6 +1,6 @@ Train supervised model for classification of target variable Class Database ../../../datasets/Iris/Iris.txt: Read records: 150 Selected records: 105 -Data preparation time: 0:00:00.08 +Data preparation time: 0:00:00.09 SNB train time: 0:00:00 Build Selective Naive Bayes SNB_Iris Build Univariate BU1_Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/time.log index 964211e56..6f1225ff0 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/IrisG/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.31251096725463867 +Overal time: 0.33158230781555176 diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.ModelingReport.xls index e4446585e..c8b8b2ecb 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.PreparationReport.xls index 8857f9cb7..28b24ee5f 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.TestEvaluationReport.xls index a04a66836..79731b9b1 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.TrainEvaluationReport.xls index 231b46551..3b7899fd9 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.khj index e397796cf..9f7dd56e7 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "Training without setosa", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.model.kdic index d700461da..d17f946fe 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary SNB_Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/time.log index 570ef9d88..c9d5cf119 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/IrisLight/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.2018754482269287 +Overal time: 0.21962904930114746 diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.ModelingReport.xls index 75808843b..7cef48b4e 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.Preparation2DReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.Preparation2DReport.xls index 49614b144..4939c0f04 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.Preparation2DReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.Preparation2DReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.PreparationReport.xls index 266ba9703..d6c1d30e6 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.TestEvaluationReport.xls index 44df75962..0f4cf3981 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.TrainEvaluationReport.xls index 25ab1a5c5..12209de10 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.khj index d0a9b0fa6..94c66bcff 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.model.kdic index 6734dd778..f8d2c8ee4 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary SNB_Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/err.txt index c37283be3..6910a374a 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/err.txt @@ -1,7 +1,7 @@ Train supervised model for classification of target variable Class Database ../../../datasets/Iris/Iris.txt: Read records: 150 Selected records: 105 Evaluation of variable pairs -Data preparation time: 0:00:00.09 +Data preparation time: 0:00:00.10 SNB train time: 0:00:00 Build Selective Naive Bayes SNB_Iris Train evaluation of Selective Naive Bayes on database ../../../datasets/Iris/Iris.txt diff --git a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/time.log index 5cae79a1e..4d206baf1 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/IrisLight2D/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.2889559268951416 +Overal time: 0.2938506603240967 diff --git a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.ModelingReport.xls index 632710dac..95b408e2b 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.PreparationReport.xls index e1bda14d3..fa44a19d6 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TestEvaluationReport.xls index cdfcf6dd5..a1fb1ce52 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TrainEvaluationReport.xls index fe252bb02..e78a32ff5 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TreePreparationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TreePreparationReport.xls index a4272895d..e4f1805a2 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TreePreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.TreePreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.khj index 60895e1f2..812863ec5 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.model.kdic index bf9204138..d5be75001 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary SNB_Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/time.log index 5e83f422b..d88d94101 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/IrisLightWithTrees/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.23284912109375 +Overal time: 0.2581307888031006 diff --git a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.ModelingReport.xls index 8053ba9b0..e379bd134 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.PreparationReport.xls index 429358d2e..018aff24b 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.TestEvaluationReport.xls index e619c8c04..6e1262a70 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.TrainEvaluationReport.xls index 12ba1bf96..42662b595 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.khj index 75bbb28d0..1ec92fd8e 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.model.kdic index 75edaca48..16db960d8 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Dictionary BU1_Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/err.txt index d38708661..9a6437f7e 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/err.txt @@ -1,6 +1,6 @@ Train supervised model for regression of target variable PetalLength Database ../../../datasets/Iris/Iris.txt: Read records: 150 Selected records: 105 -Data preparation time: 0:00:00.19 +Data preparation time: 0:00:00.21 SNB train time: 0:00:00 Build Selective Naive Bayes SNB_Iris Build Baseline B_Iris diff --git a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/time.log index daec461b5..55a504291 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/IrisR/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.41715097427368164 +Overal time: 0.45478200912475586 diff --git a/test/LearningTest/TestKhiops/Standard/IrisTransfer/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/IrisTransfer/results.ref/time.log index f5eff3874..093f7e02d 100644 --- a/test/LearningTest/TestKhiops/Standard/IrisTransfer/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/IrisTransfer/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.14530396461486816 +Overal time: 0.14561104774475098 diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.ModelingReport.xls index a9c96e3a6..16d2e8bdd 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary SpliceJunction diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.PreparationReport.xls index e6e020db7..08724b9c8 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.TestEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.TestEvaluationReport.xls index 611abe35e..81bef2755 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.TestEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.TestEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Test evaluation report Dictionary SpliceJunction diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.TrainEvaluationReport.xls index 02d84fe91..5d8c58fd8 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary SpliceJunction diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.khj index 12451ce47..4a154716d 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.model.kdic index c99453876..f003d1949 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/C100_AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Root Dictionary SNB_SpliceJunction (SampleId) diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/err.txt index 2f0ce4d27..fa25bf0c8 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/err.txt @@ -1,9 +1,9 @@ -Variable construction time: 0:00:00.08 (100 constructed variables) +Variable construction time: 0:00:00.09 (100 constructed variables) Train supervised model for classification of target variable Class Database ../../../MTdatasets/SpliceJunction/SpliceJunction.txt: Read records: 3178 Selected records: 303 Table ../../../MTdatasets/SpliceJunction/SpliceJunctionDNA.txt Records: 18,180 -Data preparation time: 0:00:00.13 -SNB train time: 0:00:00 +Data preparation time: 0:00:00.14 +SNB train time: 0:00:00.01 Build Selective Naive Bayes SNB_SpliceJunction Train evaluation of Selective Naive Bayes on database ../../../MTdatasets/SpliceJunction/SpliceJunction.txt Test evaluation of Selective Naive Bayes on database ../../../MTdatasets/SpliceJunction/SpliceJunction.txt diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/time.log index 177ffc274..91e76dcbe 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.5552172660827637 +Overal time: 0.6348357200622559 diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.Preparation2DReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.Preparation2DReport.xls index 328a61cc5..ae9c331e0 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.Preparation2DReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.Preparation2DReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.7i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.PreparationReport.xls index be242e8e0..d095798c5 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.7i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.khj index c6d1387d3..c615bb3a8 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/C100_AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.7i", + "version": "10.4.8i", "shortDescription": "", "preparationReport": { "reportType": "Preparation", diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/err.txt index c20f97aa1..c6e3cc44d 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/err.txt @@ -3,6 +3,6 @@ Train supervised model for classification of target variable Class Database ../../../MTdatasets/SpliceJunction/SpliceJunction.txt: Read records: 3178 Selected records: 303 Table ../../../MTdatasets/SpliceJunction/SpliceJunctionDNA.txt Records: 18,180 Evaluation of variable pairs -Data preparation time: 0:00:02.48 +Data preparation time: 0:00:02.51 Write report ./results/C100_AnalysisResults.khj diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/time.log index 75be0ad84..c4f90ea4c 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunction2D/results.ref/time.log @@ -1 +1 @@ -Overal time: 2.715700626373291 +Overal time: 2.760221242904663 diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/C100_AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/C100_AnalysisResults.PreparationReport.xls index 4bca2e8be..c24078e22 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/C100_AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/C100_AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/C100_AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/C100_AnalysisResults.khj index e9acbf38f..e17953335 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/C100_AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/C100_AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "preparationReport": { "reportType": "Preparation", diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/err.txt index 1cdd9b468..af1465bdd 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/err.txt @@ -1,4 +1,4 @@ -Variable construction time: 0:00:00.17 (100 constructed variables) +Variable construction time: 0:00:00.20 (100 constructed variables) Train supervised model for classification of target variable Class Database ./SpliceJunctionExternal.txt: Read records: 3178 Selected records: 303 Data preparation time: 0:00:00.15 diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/time.log index 32d78802a..226cad2a5 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionExternal/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.4532008171081543 +Overal time: 0.49777817726135254 diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/C100_AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/C100_AnalysisResults.PreparationReport.xls index 09ab1890d..00bdad493 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/C100_AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/C100_AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/C100_AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/C100_AnalysisResults.khj index bd09be57a..db28cee99 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/C100_AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/C100_AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "preparationReport": { "reportType": "Preparation", diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/err.txt index 16bfebe7a..ded448b72 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/err.txt @@ -1,7 +1,7 @@ -Variable construction time: 0:00:00.08 (100 constructed variables) +Variable construction time: 0:00:00.09 (100 constructed variables) Train supervised model for classification of target variable Class Database ../../../MTdatasets/SpliceJunction/SpliceJunction.txt: Read records: 3178 Selected records: 303 Table ../../../MTdatasets/SpliceJunction/SpliceJunctionDNA.txt Records: 18,180 -Data preparation time: 0:00:00.11 +Data preparation time: 0:00:00.12 Write report ./results/C100_AnalysisResults.khj diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/time.log index fdc02d7c6..7efa6fbd7 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionPreparation/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.3499460220336914 +Overal time: 0.3739635944366455 diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionTransfer/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/SpliceJunctionTransfer/results.ref/err.txt index 303d613d1..3dd688c0b 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionTransfer/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionTransfer/results.ref/err.txt @@ -3,5 +3,5 @@ Input database ../../../MTdatasets/SpliceJunction/SpliceJunction.txt: Read recor Table ../../../MTdatasets/SpliceJunction/SpliceJunctionDNA.txt Records: 135,240 Output database ./results/D_SpliceJunction.txt: Written records: 2254 Table ./results/D_SpliceJunctionDNA.txt Records: 135,240 -Model deployment time: 0:00:00.16 +Model deployment time: 0:00:00.17 diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionTransfer/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/SpliceJunctionTransfer/results.ref/time.log index eccf20468..a849126c0 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionTransfer/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionTransfer/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.29662609100341797 +Overal time: 0.2981998920440674 diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.ModelingReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.ModelingReport.xls index 312f75ab7..5a4450148 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.ModelingReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.ModelingReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Modeling report Dictionary SpliceJunction diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.PreparationReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.PreparationReport.xls index 085e22ce8..525b16182 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.PreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.PreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.TrainEvaluationReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.TrainEvaluationReport.xls index ed18af0ab..170b9401e 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.TrainEvaluationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.TrainEvaluationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Train evaluation report Dictionary SpliceJunction diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.TreePreparationReport.xls b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.TreePreparationReport.xls index f4deeb9d3..0dedae257 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.TreePreparationReport.xls +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.TreePreparationReport.xls @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Descriptive statistics diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.khj b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.khj index 840908e91..63fb8d9d1 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.khj +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.khj @@ -1,6 +1,6 @@ { "tool": "Khiops", - "version": "10.4.6i", + "version": "10.4.8i", "shortDescription": "", "modelingReport": { "reportType": "Modeling", diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.model.kdic b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.model.kdic index 3e3113ae7..de0bfe661 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.model.kdic +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/C100_AnalysisResults.model.kdic @@ -1,4 +1,4 @@ -#Khiops 10.4.6i +#Khiops 10.4.8i Root Dictionary SNB_SpliceJunction (SampleId) diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/err.txt b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/err.txt index cbbdffda8..26d5fbdf0 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/err.txt +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/err.txt @@ -1,9 +1,9 @@ -Variable construction time: 0:00:00.08 (100 constructed variables) +Variable construction time: 0:00:00.09 (100 constructed variables) Train supervised model for classification of target variable Class Database ../../../MTdatasets/SpliceJunction/SpliceJunction.txt: Read records: 3178 Selected records: 303 Table ../../../MTdatasets/SpliceJunction/SpliceJunctionDNA.txt Records: 18,180 Computation of 2 distinct decision trees (out of 5 planned) -Data preparation time: 0:00:00.14 +Data preparation time: 0:00:00.15 SNB train time: 0:00:00.01 Build Selective Naive Bayes SNB_SpliceJunction Train evaluation of Selective Naive Bayes on database ../../../MTdatasets/SpliceJunction/SpliceJunction.txt diff --git a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/time.log b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/time.log index 2d6da76a9..5f2492cea 100644 --- a/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/time.log +++ b/test/LearningTest/TestKhiops/Standard/SpliceJunctionWithTrees/results.ref/time.log @@ -1 +1 @@ -Overal time: 0.4563112258911133 +Overal time: 0.5006570816040039 diff --git a/test/LearningTest/cmd/python/check_results.py b/test/LearningTest/cmd/python/check_results.py index 10646dfe5..1f176b47e 100644 --- a/test/LearningTest/cmd/python/check_results.py +++ b/test/LearningTest/cmd/python/check_results.py @@ -353,13 +353,13 @@ def filter_khiops_temp_dir(value): # cas special du fichier d'erreur en coclustering: # on saute les lignes d'ecritire de rapport intermediaire qui different par le temps - # ("Write intermediate coclustering report") + # ("Write intermediate ...") if ( is_error_file and length_r > 0 - and row_r[i].find("Write intermediate coclustering report") != -1 + and row_r[i].find("Write intermediate ") != -1 and length_t > 0 - and row_t[i].find("Write intermediate coclustering report") != -1 + and row_t[i].find("Write intermediate ") != -1 ): continue diff --git a/test/LearningTest/cmd/python/help_options.py b/test/LearningTest/cmd/python/help_options.py index 3940a4310..befcfadfe 100644 --- a/test/LearningTest/cmd/python/help_options.py +++ b/test/LearningTest/cmd/python/help_options.py @@ -3,7 +3,7 @@ print( "KhiopsBatchMode: " + str(os.getenv("KhiopsBatchMode")) - + "\n\t true, false (default: false)" + + "\n\t true, false (default: true)" ) print( diff --git a/test/LearningTest/cmd/python/test_khiops.py b/test/LearningTest/cmd/python/test_khiops.py index 3b86f31f6..d95f2f331 100644 --- a/test/LearningTest/cmd/python/test_khiops.py +++ b/test/LearningTest/cmd/python/test_khiops.py @@ -252,12 +252,6 @@ def test(modl_path, samples_path, sample_test): # un plantagephysique de l'allocateur en cas de depassement des contraintes memoires des scenarios os.putenv("KhiopsHardMemoryLimitMode", "true") - # khiops en mode multitable via une variable d'environnement - os.putenv("KhiopsMultiTableMode", "true") - - # khiops en mode Text via une variable d'environnement - # os.putenv('KhiopsTextVariableMode', 'true') - # khiops en mode crash test via une variable d'environnement os.putenv("KhiopsCrashTestMode", "true") @@ -270,7 +264,7 @@ def test(modl_path, samples_path, sample_test): khiops_params.append("-n") khiops_params.append(khiops_mpi_process_number) khiops_params.append(modl_path) - if os.getenv("KhiopsBatchMode") == "true": + if os.getenv("KhiopsBatchMode") != "false": khiops_params.append("-b") khiops_params.append("-i") khiops_params.append(os.path.join(os.getcwd(), "test.prm"))