Add default rule aggregation to settings

neuralogic/core/settings/__init__.py

@@ -5,7 +5,7 @@
 from neuralogic.nn.init import Initializer, Uniform
 from neuralogic.nn.loss import MSE, ErrorFunction
 from neuralogic.core.settings.settings_proxy import SettingsProxy
-from neuralogic.core.constructs.function import Transformation, Combination
+from neuralogic.core.constructs.function import Transformation, Combination, Aggregation
 from neuralogic.optim import Optimizer, Adam
 
 
@@ -20,6 +20,7 @@ def __init__(
         initializer: Initializer = Uniform(),
         rule_transformation: Transformation = Transformation.TANH,
         rule_combination: Combination = Combination.SUM,
+        rule_aggregation: Aggregation = Aggregation.AVG,
         relation_transformation: Transformation = Transformation.TANH,
         relation_combination: Combination = Combination.SUM,
         iso_value_compression: bool = True,
@@ -127,6 +128,14 @@ def rule_combination(self) -> Combination:
     def rule_combination(self, value: Combination):
         self._update("rule_combination", value)
 
+    @property
+    def rule_aggregation(self) -> Aggregation:
+        return self.params["rule_aggregation"]
+
+    @rule_aggregation.setter
+    def rule_aggregation(self, value: Aggregation):
+        self._update("rule_aggregation", value)
+
     def create_proxy(self) -> SettingsProxy:
         proxy = SettingsProxy(**self.params)
         self._proxies.add(proxy)

neuralogic/core/settings/settings_proxy.py

@@ -2,7 +2,7 @@
 
 import neuralogic
 from neuralogic import is_initialized, initialize
-from neuralogic.core.constructs.function import Transformation, Combination
+from neuralogic.core.constructs.function import Transformation, Combination, Aggregation
 from neuralogic.core.enums import Grounder
 from neuralogic.nn.init import Initializer
 from neuralogic.nn.loss import MSE, SoftEntropy, CrossEntropy, ErrorFunction
@@ -20,6 +20,7 @@ def __init__(
         initializer: Initializer,
         rule_transformation: Transformation,
         rule_combination: Combination,
+        rule_aggregation: Aggregation,
         relation_transformation: Transformation,
         relation_combination: Combination,
         iso_value_compression: bool,
@@ -223,6 +224,14 @@ def rule_combination(self) -> Combination:
     def rule_combination(self, value: Combination):
         self.settings.ruleNeuronCombination = self.get_combination_function(value)
 
+    @property
+    def rule_aggregation(self) -> Aggregation:
+        return Aggregation(str(self.settings.aggNeuronAggregation))
+
+    @rule_aggregation.setter
+    def rule_aggregation(self, value: Aggregation):
+        self.settings.aggNeuronAggregation = self.get_aggregation_function(value)
+
     @property
     def debug_exporting(self) -> bool:
         return self.settings.debugExporting
@@ -243,6 +252,10 @@ def get_combination_function(self, combination: Combination):
         combination_name = str(combination)
         return self.settings_class.parseCombination(combination_name)
 
+    def get_aggregation_function(self, aggregation: Aggregation):
+        aggregation_name = str(aggregation)
+        return self.settings_class.parseCombination(aggregation_name)
+
     def get_transformation_function(self, transformation: Transformation):
         transformation_name = str(transformation)
         return self.settings_class.parseTransformation(transformation_name)