Changeset 431 for trunk/sources/HeuristicLab.Constraints

Timestamp:

08/03/08 23:33:45 (16 years ago)

Author:

gkronber

Message:

removed the 'AllowedSubOperators' variable for functions because the original intention was to cache the list of allowed sub-functions which is actually determined by a tree of constraints. However the original idea was never fully implemented so up to now any function in the library was allowed for any other function as long as it was not a terminal (also defined by constraints on the arity). The 'AllowedSubOperators' variable is not necessary at all when we defined the set via constraints. The SubOperatorsConstraintView allows draging of functions from the library into the constraint.

Next step: automatic adaption of SubOperatorsConstraints of functions in the library when new functions are added or existing entries removed.
(ticket #225)

File:

• trunk/sources/HeuristicLab.Constraints/SubOperatorsConstraintAnalyser.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Constraints/SubOperatorsConstraintAnalyser.cs

@@ -37 +37 @@
 
     public IList<IOperator> GetAllowedOperators(IOperator op, int childIndex) {
-
       AndConstraint andConstraint = new AndConstraint();
       foreach(IConstraint constraint in op.Constraints) {
         andConstraint.Clauses.Add(constraint);
       }
-
+      
       GetAllowedOperatorsVisitor visitor = new GetAllowedOperatorsVisitor(allPossibleOperators, childIndex);
       andConstraint.Accept(visitor);
-
       return visitor.AllowedOperators;
     }