Ignore:
Timestamp:
02/25/12 23:45:38 (2 years ago)
Author:
janezd <janez.demsar@…>
Branch:
default
Message:

Fixed problems due to refactoring of classification.rules

File:
1 edited

Legend:

Unmodified
Added
Removed
  • source/orange/lib_learner.cpp

    r10299 r10377  
    16151615C_NAMED(Rule - Orange.classification.rules.Rule, Orange, "()") 
    16161616 
    1617 C_NAMED(RuleValidator_LRS - Orange.classification.rules.RuleValidator_LRS, RuleValidator, "([alpha=0.05,min_coverage=0,max_rule_complexity=0,min_quality=numeric_limits<float>::min()])") 
    1618  
    1619 C_NAMED(RuleEvaluator_Entropy - Orange.classification.rules.RuleEvaluator_Entropy, RuleEvaluator, "()") 
    1620 C_NAMED(RuleEvaluator_Laplace - Orange.classification.rules.RuleEvaluator_Laplace, RuleEvaluator, "()") 
    1621 C_NAMED(RuleEvaluator_LRS - Orange.classification.rules.RuleEvaluator_LRS, RuleEvaluator, "()") 
    1622 C_NAMED(RuleEvaluator_mEVC - Orange.classification.rules.RuleEvaluator_mEVC, RuleEvaluator, "(ruleAlpha=1.0,attributeAlpha=1.0)") 
     1617C_NAMED(RuleValidator_LRS - Orange.classification.rules.Validator_LRS, RuleValidator, "([alpha=0.05,min_coverage=0,max_rule_complexity=0,min_quality=numeric_limits<float>::min()])") 
     1618 
     1619C_NAMED(RuleEvaluator_Entropy - Orange.classification.rules.Evaluator_Entropy, RuleEvaluator, "()") 
     1620C_NAMED(RuleEvaluator_Laplace - Orange.classification.rules.Evaluator_Laplace, RuleEvaluator, "()") 
     1621C_NAMED(RuleEvaluator_LRS - Orange.classification.rules.Evaluator_LRS, RuleEvaluator, "()") 
     1622C_NAMED(RuleEvaluator_mEVC - Orange.classification.rules.Evaluator_mEVC, RuleEvaluator, "(ruleAlpha=1.0,attributeAlpha=1.0)") 
    16231623 
    16241624C_NAMED(EVDist, Orange, "()") 
    16251625C_NAMED(EVDistGetter_Standard, EVDistGetter, "()") 
    16261626 
    1627 C_NAMED(RuleBeamFinder - Orange.classification.rules.RuleBeamFinder, RuleFinder, "([validator=, evaluator=, initializer=, refiner=, candidateSelector=, ruleFilter=])") 
    1628  
    1629 C_NAMED(RuleBeamInitializer_Default - Orange.classification.rules.RuleBeamInitializer_Default, RuleBeamInitializer, "()") 
    1630  
    1631 C_NAMED(RuleBeamRefiner_Selector - Orange.classification.rules.RuleBeamRefiner_Selector, RuleBeamRefiner, "([discretization=])") 
    1632  
    1633 C_NAMED(RuleBeamCandidateSelector_TakeAll - Orange.classification.rules.RuleBeamCandidateSelector_TakeAll, RuleBeamCandidateSelector, "()") 
    1634  
    1635 C_NAMED(RuleBeamFilter_Width - Orange.classification.rules.RuleBeamFilter_Width, RuleBeamFilter, "([width=5])") 
    1636  
    1637 C_NAMED(RuleDataStoppingCriteria_NoPositives - Orange.classification.rules.RuleDataStoppingCriteria_NoPositives, RuleDataStoppingCriteria, "()") 
    1638  
    1639 C_NAMED(RuleCovererAndRemover_Default - Orange.classification.rules.RuleCovererAndRemover_Default, RuleCovererAndRemover, "()") 
    1640  
    1641 C_NAMED(RuleStoppingCriteria_NegativeDistribution - Orange.classification.rules.RuleStoppingCriteria_NegativeDistribution, RuleStoppingCriteria, "()") 
     1627C_NAMED(RuleBeamFinder - Orange.classification.rules.BeamFinder, RuleFinder, "([validator=, evaluator=, initializer=, refiner=, candidateSelector=, ruleFilter=])") 
     1628 
     1629C_NAMED(RuleBeamInitializer_Default - Orange.classification.rules.BeamInitializer_Default, RuleBeamInitializer, "()") 
     1630 
     1631C_NAMED(RuleBeamRefiner_Selector - Orange.classification.rules.BeamRefiner_Selector, RuleBeamRefiner, "([discretization=])") 
     1632 
     1633C_NAMED(RuleBeamCandidateSelector_TakeAll - Orange.classification.rules.BeamCandidateSelector_TakeAll, RuleBeamCandidateSelector, "()") 
     1634 
     1635C_NAMED(RuleBeamFilter_Width - Orange.classification.rules.BeamFilter_Width, RuleBeamFilter, "([width=5])") 
     1636 
     1637C_NAMED(RuleDataStoppingCriteria_NoPositives - Orange.classification.rules.DataStoppingCriteria_NoPositives, RuleDataStoppingCriteria, "()") 
     1638 
     1639C_NAMED(RuleCovererAndRemover_Default - Orange.classification.rules.CovererAndRemover_Default, RuleCovererAndRemover, "()") 
     1640 
     1641C_NAMED(RuleStoppingCriteria_NegativeDistribution - Orange.classification.rules.StoppingCriteria_NegativeDistribution, RuleStoppingCriteria, "()") 
    16421642C_CALL(RuleLearner - Orange.classification.rules.RuleLearner, Learner, "([examples[, weightID]]) -/-> Classifier") 
    16431643 
     
    16851685} 
    16861686 
    1687 PyObject *RuleEvaluator_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleEvaluator, "<abstract>") 
     1687PyObject *RuleEvaluator_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.Evaluator, "<abstract>") 
    16881688{ if (type == (PyTypeObject *)&PyOrRuleEvaluator_Type) 
    16891689    return setCallbackFunction(WrapNewOrange(mlnew TRuleEvaluator_Python(), type), args); 
     
    17491749} 
    17501750 
    1751 PyObject *RuleValidator_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleValidator, "<abstract>") 
     1751PyObject *RuleValidator_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.Validator, "<abstract>") 
    17521752{ if (type == (PyTypeObject *)&PyOrRuleValidator_Type) 
    17531753    return setCallbackFunction(WrapNewOrange(mlnew TRuleValidator_Python(), type), args); 
     
    17841784} 
    17851785 
    1786 PyObject *RuleCovererAndRemover_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleCovererAndRemover, "<abstract>") 
     1786PyObject *RuleCovererAndRemover_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.CovererAndRemover, "<abstract>") 
    17871787{ if (type == (PyTypeObject *)&PyOrRuleCovererAndRemover_Type) 
    17881788    return setCallbackFunction(WrapNewOrange(mlnew TRuleCovererAndRemover_Python(), type), args); 
     
    18171817} 
    18181818 
    1819 PyObject *RuleStoppingCriteria_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleStoppingCriteria, "<abstract>") 
     1819PyObject *RuleStoppingCriteria_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.StoppingCriteria, "<abstract>") 
    18201820{ if (type == (PyTypeObject *)&PyOrRuleStoppingCriteria_Type) 
    18211821    return setCallbackFunction(WrapNewOrange(mlnew TRuleStoppingCriteria_Python(), type), args); 
     
    18491849} 
    18501850 
    1851 PyObject *RuleDataStoppingCriteria_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleDataStoppingCriteria, "<abstract>") 
     1851PyObject *RuleDataStoppingCriteria_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.DataStoppingCriteria, "<abstract>") 
    18521852{ if (type == (PyTypeObject *)&PyOrRuleDataStoppingCriteria_Type) 
    18531853    return setCallbackFunction(WrapNewOrange(mlnew TRuleDataStoppingCriteria_Python(), type), args); 
     
    18801880} 
    18811881 
    1882 PyObject *RuleFinder_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleFinder, "<abstract>") 
     1882PyObject *RuleFinder_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.Finder, "<abstract>") 
    18831883{ if (type == (PyTypeObject *)&PyOrRuleFinder_Type) 
    18841884    return setCallbackFunction(WrapNewOrange(mlnew TRuleFinder_Python(), type), args); 
     
    19121912} 
    19131913 
    1914 PyObject *RuleBeamRefiner_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleBeamRefiner, "<abstract>") 
     1914PyObject *RuleBeamRefiner_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.BeamRefiner, "<abstract>") 
    19151915{ if (type == (PyTypeObject *)&PyOrRuleBeamRefiner_Type) 
    19161916    return setCallbackFunction(WrapNewOrange(mlnew TRuleBeamRefiner_Python(), type), args); 
     
    19441944} 
    19451945 
    1946 PyObject *RuleBeamInitializer_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleBeamInitializer, "<abstract>") 
     1946PyObject *RuleBeamInitializer_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.BeamInitializer, "<abstract>") 
    19471947{ if (type == (PyTypeObject *)&PyOrRuleBeamInitializer_Type) 
    19481948    return setCallbackFunction(WrapNewOrange(mlnew TRuleBeamInitializer_Python(), type), args); 
     
    19801980} 
    19811981 
    1982 PyObject *RuleBeamCandidateSelector_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleBeamCandidateSelector, "<abstract>") 
     1982PyObject *RuleBeamCandidateSelector_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.BeamCandidateSelector, "<abstract>") 
    19831983{ if (type == (PyTypeObject *)&PyOrRuleBeamCandidateSelector_Type) 
    19841984    return setCallbackFunction(WrapNewOrange(mlnew TRuleBeamCandidateSelector_Python(), type), args); 
     
    20122012} 
    20132013 
    2014 PyObject *RuleBeamFilter_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleBeamFilter, "<abstract>") 
     2014PyObject *RuleBeamFilter_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.BeamFilter, "<abstract>") 
    20152015{ if (type == (PyTypeObject *)&PyOrRuleBeamFilter_Type) 
    20162016    return setCallbackFunction(WrapNewOrange(mlnew TRuleBeamFilter_Python(), type), args); 
     
    20432043} 
    20442044 
    2045 PyObject *RuleClassifierConstructor_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.RuleClassifierConstructor, "<abstract>") 
     2045PyObject *RuleClassifierConstructor_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.rules.ClassifierConstructor, "<abstract>") 
    20462046{ if (type == (PyTypeObject *)&PyOrRuleClassifierConstructor_Type) 
    20472047    return setCallbackFunction(WrapNewOrange(mlnew TRuleClassifierConstructor_Python(), type), args); 
Note: See TracChangeset for help on using the changeset viewer.