Fix UnivariateFeature and tests

src/logisets/scalar/dataset-bindings.jl

@@ -239,8 +239,12 @@ function scalarlogiset(
             conditions = naturalconditions(dataset, features, featvaltype)
             features = unique(feature.(conditions))
         else
-            error("Unexpected case (TODO)." *
-                "features = $(typeof(features)), conditions = $(typeof(conditions))")
+            if !all(f->f isa VarFeature, features) # or AbstractFeature
+                error("Unexpected case (TODO). " *
+                    "features = $(typeof(features)), conditions = $(typeof(conditions)). " *
+                    "Suspects: $(filter(f->!(f isa VarFeature), features))"
+                )
+            end
         end
     end
 

src/logisets/scalar/var-features.jl

@@ -196,6 +196,15 @@ See also [`Interval`](@ref),
 struct UnivariateFeature{U} <: AbstractUnivariateFeature{U}
     i_variable::Integer
     f::Function
+    function UnivariateFeature{U}(feat::UnivariateFeature) where {U<:Real}
+        return new{U}(i_variable(f), feat.f)
+    end
+    function UnivariateFeature{U}(i_variable::Integer, f::Function) where {U<:Real}
+        return new{U}(i_variable, f)
+    end
+    function UnivariateFeature(i_variable::Integer, f::Function)
+        return UnivariateFeature{DEFAULT_VARFEATVALTYPE}(i_variable, f)
+    end
 end
 featurename(f::UnivariateFeature) = string(f.f)
 

test/logisets/multilogisets.jl

@@ -19,11 +19,11 @@ multilogiset = @test_nowarn scalarlogiset(multidataset)
 
 generic_features = collect(Iterators.flatten([[UnivariateMax(i_var), UnivariateMin(i_var)] for i_var in 1:_nvars]))
 metaconditions = [ScalarMetaCondition(feature, >) for feature in generic_features]
-multilogiset = @test_logs (:warn,) scalarlogiset(multidataset; use_full_memoization = false, use_onestep_memoization = true, conditions = metaconditions, relations = multirelations)
-multilogiset = @test_logs (:warn,) scalarlogiset(multidataset; use_full_memoization = true, use_onestep_memoization = true, conditions = metaconditions, relations = multirelations)
+multilogiset = @test_logs min_level=Logging.Error scalarlogiset(multidataset; use_full_memoization = false, use_onestep_memoization = true, conditions = metaconditions, relations = multirelations)
+multilogiset = @test_logs min_level=Logging.Error scalarlogiset(multidataset; use_full_memoization = true, use_onestep_memoization = true, conditions = metaconditions, relations = multirelations)
 
 metaconditions = vcat([[ScalarMetaCondition(feature, >), ScalarMetaCondition(feature, <)] for feature in generic_features]...)
-complete_supported_multilogiset = @test_logs (:warn,) scalarlogiset(multidataset; use_full_memoization = true, use_onestep_memoization = true, conditions = metaconditions, relations = multirelations)
+complete_supported_multilogiset = @test_logs min_level=Logging.Error scalarlogiset(multidataset; use_full_memoization = true, use_onestep_memoization = true, conditions = metaconditions, relations = multirelations)
 
 
 @test_nowarn slicedataset(multilogiset, [2,1])