Improvements for 0.2.2

.gitignore

@@ -61,6 +61,9 @@ local_settings.py
 db.sqlite3
 db.sqlite3-journal
 
+# Mac
+.DS_Store
+
 # Flask stuff:
 instance/
 .webassets-cache
@@ -128,5 +131,5 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# Outputs
-core/output/
+# Output folder
+/core/output/**

core/examples/abstr_inh.wfl

@@ -0,0 +1,11 @@
+abstract a {
+    b -> integer
+    [b > 2]
+}
+
+abstract b: a {
+    c -> integer
+    [c > 2]
+}
+
+d : b

core/examples/brise.wfl

@@ -1,133 +1,22 @@
-SamplingStrategy {
-    Region -> string
-    Strategy {
+abstract Region {
+	sa: SamplingStrategy
+}
+
+abstract SamplingStrategy {
+    RegionID -> string
+    test -> integer
+    xor Strategy {
         Sobol
         MersenneTwister
     }
-   [Region in Context.ExperimentRegions.Regions]
-   [size Context.ExperimentRegions.Regions == size unique 'Region' at self]
-}
-
-// -------------------------Parameters---------------------------
-abstract Hyperparameter {
-    Type -> predefined
-    Region -> predefined
-    [Region = TopLevel]
-    [if parent.Type == "Category" then Region = fname.parent else Region = parent.Region]
-}
-
-abstract Category {
-    Type -> predefined
-    Region -> predefined
-    [Type = "Category"]
-    [Region = parent.Region]
-}
-
-abstract ParentCategoricalHyperparameter : Hyperparameter {
-	Categories -> predefined
-    Default -> string    
-    [Default in Categories]
-	[Type = "ParentCategoricalHyperparameter"]
-    [Categories = (filter childs.self where Type == "Category")]    
-}
-
-abstract CategoricalHyperparameter : Hyperparameter {
-    Categories -> predefined
-    Default -> string 
-    [Default in Categories] 
-}
-
-abstract NominalHyperparameter: CategoricalHyperparameter {
-    [Type = "NominalHyperparameter"]
-}
-
-abstract OrdinalHyperparameter: CategoricalHyperparameter {
-    [Type = "OrdinalHyperparameter"]
-}
-
-abstract NumericHyperparameter: Hyperparameter
-
-abstract FloatHyperparameter: NumericHyperparameter {
-    Lower -> float
-    Upper -> float
-    Default -> float
-    [Default >= Lower]
-    [Default <= Upper]
-    [Type = "FloatHyperparameter"]
-}
-
-abstract IntegerHyperparameter: NumericHyperparameter {
-    Lower -> integer
-    Upper -> integer
-    Default -> integer
-    [Default >= Lower]
-    [Default <= Upper]
-    [Type = "IntegerHyperparameter"]
-}
-abstract Objective{
-    Name -> predefined
-    DataType -> predefined
-    Minimization -> predefined
-    MinExpectedValue -> predefined
-    MaxExpectedValue -> predefined
+    [test > 2]
+   [RegionID in Context.ExperimentRegions.Regionss]
 }
 
 Context {
-    Experiment {
-        Title -> predefined
-        [Title = 'EnergyConsumption']
-        TaskConfiguration {
-            TaskName -> predefined
-            [TaskName = 'energy_consumption']
-            MaxTimeToRunTask -> predefined
-            [MaxTimeToRunTask = 10]
-
-            Scenario {
-                FromFile {
-                    WsFile -> predefined
-                    [WsFile = 'search_space_96/Radix-500mio_full.csv']
-                }
-            }
-            Objectives {
-                Energy : Objective {
-                    [Name = "energy"]
-                    [DataType = float]
-                    [Minimization = true]
-                    [MinExpectedValue = 0]
-                    [MaxExpectedValue = 150000.0]
-                }
-                Time : Objective {
-                    [Name = "time"]
-                    [DataType = float]
-                    [Minimization = true]
-                    [MinExpectedValue = 0]
-                    [MaxExpectedValue = 150000.0]
-                }
-            }
-        }
-
-        SearchSpace {
-            Type -> predefined
-            Region -> predefined
-            [Type = "SearchSpace"]
-            [Region = "TopLevel"]
-
-            LLH: ParentCategoricalHyperparameter {
-				jMetalPy_SA: Category {
-					parameter: IntegerHyperparameter
-				}
-				jMetal_ES: Category {
-					parameter: IntegerHyperparameter
-				}
-				jMetalPy_ES: Category {
-					parameter: IntegerHyperparameter
-				}
-			}
-        }
-    }
     ExperimentRegions {
-        Regions -> predefined
-        [Regions = unique Region at Context.Experiment.SearchSpace]
-        [fcard.SamplingStrategy = size Regions]
+        Regionss -> array
+		[fcard.Regions = size Regionss]
+		Regions: Region
     }
 }

core/examples/complex_card_constraint.wfl

@@ -1,17 +1,7 @@
-a 2..3 {
-	xor b 2..3 {
-		c 2..3 {
-			d -> integer
-		}
-		e 2..3 {
-			b -> integer 2..3
-			c -> integer
-			[c > b]
-		}
-	}
+xor b 2..3 {
+    e 2..3 {
+        b -> integer 2..3
+        c -> integer
+        [c > b]
+    }
 }
-
-b 2..3 {
-	c -> integer 2..3 
-	[c > 2]
-}

core/examples/empty_fields.wfl

@@ -3,12 +3,12 @@ a {
     [b = 2]
     [b > 1]
 }
-a1 2..3 {
+d 2..3 {
     b -> predefined
     [b = 3]
     [b > 2]
 }
-a2 2..3 {
+f 2..3 {
     a -> integer
     b -> predefined
     [a > 2]

core/examples/feature_analysis copy.wfl

@@ -0,0 +1,10 @@
+a {
+	b {
+		c -> integer
+		[c > 2]
+	}
+	d {
+		e -> integer
+		[e < 2]
+	}
+}

core/examples/filter_gcard_by_constraint.wfl

@@ -1,4 +1,4 @@
-Model 3 {
+Model 2 {
     xor SurrogateType {
         Single
         Compositional
@@ -13,20 +13,9 @@ Model 3 {
             Type -> predefined
             [Type = "GaussianProcessRegressor"]
         }
-        [if gcard.parent.SurrogateType == "Compositional" then size childs.Context.Objectives == size childs.self]
 
     }
     [if gcard.self.SurrogateType == "Single" then gcard.self.Surrogate = 'xor']
     [if gcard.self.SurrogateType == "Single" then fcard.self.Surrogate.GaussianProcessRegressor = 1]
     [if gcard.self.SurrogateType == "Single" then fcard.self.Surrogate.LinearRegression = 1]
-    [if gcard.self.SurrogateType == "Compositional" then gcard.self.Surrogate = 'or']
-    [if gcard.self.SurrogateType == "Portfolio" then gcard.self.Surrogate = 'or']
-}
-
-Context {
-    Objectives {
-        Objective 1..3 {
-            test -> integer
-        }
-    }
 }

core/examples/reference.wfl

@@ -1,20 +1,99 @@
-abstract A {
-	a -> integer
-	[a > 1]
+// ----------------------Abstract features-----------------------
+
+abstract Hyperparameter {
+  Type -> predefined
+  Level -> integer
+  [if gcard.Context.SearchSpace.Structure == Flat then Level == 0]
+}
+
+abstract Category {
+  Type -> predefined
+  [Type = "Category"]
+}
+
+abstract CategoricalHyperparameter : Hyperparameter {
+  Categories -> predefined
+  Default -> string
+  [Default in Categories]
+  [Categories = (filter self.childs where Type == "Category")]
+}
+
+abstract NominalHyperparameter: CategoricalHyperparameter {
+  [Type = "NominalHyperparameter"]
+}
+abstract OrdinalHyperparameter: CategoricalHyperparameter {
+  [Type = "OrdinalHyperparameter"]
 }
-abstract B : A {
-	b -> integer
-	[b > 2]
+
+abstract NumericHyperparameter: Hyperparameter
+
+abstract FloatHyperparameter: NumericHyperparameter {
+  Lower -> float
+  Upper -> float
+  Default -> float
+  [Default >= Lower]
+  [Default <= Upper]
+  [Type = "FloatHyperparameter"]
+  [fcard.StopCondition.Instance.AdaptiveSC = 0]
 }
-abstract C : A {
-	c -> integer
-	[c > 3]
+abstract IntegerHyperparameter: NumericHyperparameter {
+  Lower -> integer
+  Upper -> integer
+  Default -> integer
+  [Default >= Lower]
+  [Default <= Upper]
+  [Type = "IntegerHyperparameter"]
 }
 
-abstract D {
-    d -> integer
-    [d > 4]
+abstract Objective {
+    Name -> predefined
+    DataType -> predefined
+    Minimization -> predefined
+    MinExpectedValue -> predefined
+    MaxExpectedValue -> predefined
+}
+abstract SC {
+  Type -> predefined
+  Name -> string
 }
-F: D {
-    xor E ->> A
+// ------------------------Context Model------------------------
+Context {
+  TaskConfiguration {
+    TaskName -> predefined
+    [TaskName = "test"]
+    MaxTimeToRunTask -> integer
+    TimeUnit -> string
+    [TimeUnit in {"seconds", "minutes", "hours", "days"}]
+    Scenario
+    Objectives {
+      // objectives
+      Y1 : Objective {
+        [Name = "Y1"]
+        [DataType = "float"]
+        [Minimization = true]
+        [MinExpectedValue = 0]
+        [MaxExpectedValue = 100]
+      }
+      /*
+      Y2 : Objective {
+        [Name = "Y2"]
+        [DataType = "float"]
+        [Minimization = true]
+        [MinExpectedValue = 0]
+        [MaxExpectedValue = 100]
+      }
+      */
+    }
+  }
+
+  SearchSpace {
+    // parameters
+    X1 : FloatHyperparameter
+    X2 : IntegerHyperparameter
+    xor Structure {
+      Flat
+      Hierarchical
+    }
+    [fcard.ConfigurationSelection.Predictor.Model = size unique Level at self]
+  }
 }

core/examples/stage_rollback.wfl

@@ -0,0 +1,9 @@
+X {
+	A ? {
+        [self requires X.E.G]
+		[self excludes X.E.G]
+	}
+	E ? {
+		G
+	}
+}