diff --git a/lambda/src/LambdaDatasets/GermanDataset.hs b/lambda/src/LambdaDatasets/GermanDataset.hs index 23d174f..74307da 100644 --- a/lambda/src/LambdaDatasets/GermanDataset.hs +++ b/lambda/src/LambdaDatasets/GermanDataset.hs @@ -92,7 +92,7 @@ lE = { lambdaSpucker = 1, lambdaSchlucker = 2, symbol = 30, - variable = 10, + variable = 20, constant = 5 } } diff --git a/lambda/src/LambdaDatasets/IrisDataset.hs b/lambda/src/LambdaDatasets/IrisDataset.hs index 160c416..f3146a6 100644 --- a/lambda/src/LambdaDatasets/IrisDataset.hs +++ b/lambda/src/LambdaDatasets/IrisDataset.hs @@ -48,13 +48,13 @@ lE = ((Ref.SomeTypeRep (Ref.TypeRep @(IrisClass))), [(fmap show (enumUniform Setosa Versicolor :: RVar IrisClass))]) ], targetType = (Ref.SomeTypeRep (Ref.TypeRep @(Float -> Float -> Float -> Float -> IrisClass))), - maxDepth = 10, + maxDepth = 8, weights = ExpressionWeights { lambdaSpucker = 1, - lambdaSchlucker = 1, + lambdaSchlucker = 2, symbol = 30, - variable = 100, + variable = 20, constant = 5 } } diff --git a/lambda/src/Main.hs b/lambda/src/Main.hs index cccea44..38a9a4c 100644 --- a/lambda/src/Main.hs +++ b/lambda/src/Main.hs @@ -9,8 +9,8 @@ import Pretty import Protolude hiding (for) import System.IO -- import LambdaDatasets.IrisDataset -import LambdaDatasets.NurseryDataset --- import LambdaDatasets.GermanDataset +-- import LambdaDatasets.NurseryDataset +import LambdaDatasets.GermanDataset import Debug.Trace as DB import qualified Data.Map.Strict as Map