Ignore:
Timestamp:
03/13/12 20:37:36 (2 years ago)
Author:
martin@…
Branch:
default
Message:

Changes to rule learning.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • source/orange/rulelearner.hpp

    r8735 r10517  
    482482  __REGISTER_CLASS 
    483483 
    484   PRuleList rules; 
    485   PExampleTable examples; 
     484  PRuleList rules; //P 
     485  PExampleTable examples; //P 
    486486  int weightID; 
    487487 
    488488  float eval, **f, **p, *betas, *priorBetas; 
    489489  bool *isExampleFixed; 
    490   PFloatList avgProb, avgPriorProb; 
    491   PIntList *ruleIndices, prefixRules; 
     490  PFloatList avgProb; //P 
     491  PFloatList avgPriorProb; //P 
     492  PIntList *ruleIndices; //P 
     493  PIntList prefixRules; //P 
    492494 
    493495  TLogitClassifierState(PRuleList, PExampleTable, const int &); 
     
    515517  PDomain domain; //P Domain 
    516518  PFloatList ruleBetas; //P Rule betas 
    517   float minStep; //P minimal step value 
    518519  float minSignificance; //P minimum requested significance for betas.  
    519520  float minBeta; //P minimum beta by rule to be included in the model.  
    520   bool setPrefixRules; // P should we order prefix rules ?  
    521   bool optimizeBetasFlag; // P should we assign betas to rules ?  
     521  bool setPrefixRules; //P should we order prefix rules ?  
     522  bool optimizeBetasFlag; //P should we assign betas to rules ?  
     523  float penalty; //P 
    522524 
    523525  PClassifier priorClassifier; //P prior classifier used if provided 
    524   PLogitClassifierState currentState; 
     526  PLogitClassifierState currentState; //P 
    525527  bool *skipRule; 
    526   PFloatList wsd, wavgCov, wSatQ, wsig; // standard deviations of rule quality 
     528  // standard deviations of rule quality 
     529  PFloatList wsd; //P 
     530  PFloatList wavgCov; //P 
     531  PFloatList wSatQ; //P 
     532  PFloatList wsig; //P 
    527533  PRuleList prefixRules; //P rules that trigger before logit sum. 
    528534 
    529535  TRuleClassifier_logit(); 
    530   TRuleClassifier_logit(PRuleList rules, const float &minSignificance, const float &minBeta, PExampleTable examples, const int &weightID = 0, const PClassifier &classifer = NULL, const PDistributionList &probList = NULL, bool setPrefixRules = false, bool optimizeBetasFlag = true); 
     536  TRuleClassifier_logit(PRuleList rules, const float &minSignificance, const float &minBeta, const float &penalty, PExampleTable examples, const int &weightID = 0, const PClassifier &classifer = NULL, const PDistributionList &probList = NULL, bool setPrefixRules = false, bool optimizeBetasFlag = true); 
    531537 
    532538  void initialize(const PDistributionList &); 
Note: See TracChangeset for help on using the changeset viewer.