From 87742051f80956d0fb11c1f1383c6aea669dd67a Mon Sep 17 00:00:00 2001 From: Johannes Merl Date: Sat, 11 May 2024 19:41:51 +0200 Subject: [PATCH] fix fittness --- lambda/src/LambdaDatasets/GermanDataset.hs | 2 +- lambda/src/LambdaDatasets/IrisDataset.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lambda/src/LambdaDatasets/GermanDataset.hs b/lambda/src/LambdaDatasets/GermanDataset.hs index 5f89c30..9ae8515 100644 --- a/lambda/src/LambdaDatasets/GermanDataset.hs +++ b/lambda/src/LambdaDatasets/GermanDataset.hs @@ -189,7 +189,7 @@ evalResults ex trs = do evalResult :: LamdaExecutionEnv -> TypeRequester -> (AccountStatus -> Int -> CreditHistory -> Purpose -> Int -> Savings -> EmploymentStatus -> Int -> StatusAndSex -> OtherDebtors -> Int -> Property -> Int -> OtherPlans -> Housing -> Int -> Job -> Int -> Bool -> Bool -> GermanClass) -> (TypeRequester, FittnesRes) evalResult ex tr result = ( tr, FittnesRes - { total = score, + { total = acc * 100 + (biasSmall - 1), fitnessTotal = fitness', fitnessMean = meanOfAccuricyPerClass resAndTarget, fitnessGeoMean = geomeanOfDistributionAccuracy resAndTarget, diff --git a/lambda/src/LambdaDatasets/IrisDataset.hs b/lambda/src/LambdaDatasets/IrisDataset.hs index c147dc2..cd34254 100644 --- a/lambda/src/LambdaDatasets/IrisDataset.hs +++ b/lambda/src/LambdaDatasets/IrisDataset.hs @@ -155,7 +155,7 @@ evalResults ex trs = do evalResult :: LamdaExecutionEnv -> TypeRequester -> (Float -> Float -> Float -> Float -> IrisClass) -> (TypeRequester, FittnesRes) evalResult ex tr result = ( tr, FittnesRes - { total = score, + { total = acc * 100 + (biasSmall - 1), fitnessTotal = fitness', fitnessMean = meanOfAccuricyPerClass resAndTarget, fitnessGeoMean = geomeanOfDistributionAccuracy resAndTarget,