Changeset 10970:e81b129a6f6d in orange


Ignore:
Timestamp:
08/21/12 20:41:11 (20 months ago)
Author:
Miran Levar <mlevar@…>
Branch:
default
Message:

Additional fixes and source modifications

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Orange/testing/unit/tests/test_display_name_mapping.py

    r10969 r10970  
    1919            if type(cls) == type: 
    2020                if cls.__module__ in exempt: 
    21                     pass 
     21                    continue 
    2222                try: 
    2323                    cls2 = eval(cls.__module__ + "." + cls.__name__) 
  • source/orange/lib_kernel.cpp

    r10968 r10970  
    57145714} 
    57155715 
    5716 /* ************ MULTI-TARGET LEARNER AND CLASSIFIER ************ */ 
     5716/* ************ MULTI LEARNER AND CLASSIFIER ************ */ 
    57175717 
    57185718#include "multi_classifier.hpp" 
    57195719#include "multi_learner.hpp" 
    57205720 
    5721 ABSTRACT(MultiLearner - Orange.classification.MultiLearner, Orange) 
    5722  
     5721ABSTRACT(MultiLearner - Orange.core.MultiLearner, Orange) 
    57235722PyObject *MultiLearner_call(PyObject *self, PyObject *targs, PyObject *keywords) PYDOC("(examples) -> Classifier") 
    57245723{ 
     
    57455744} 
    57465745 
    5747 /* ************ MULTI LEARNER and MULTI CLASSIFIER ************ */ 
    5748  
    5749 ABSTRACT(MultiClassifier - Orange.classification.MultiClassifier, Orange) 
     5746ABSTRACT(MultiClassifier - Orange.core.MultiClassifier, Orange) 
    57505747 
    57515748PyObject *MultiClassifier_call(PyObject *self, PyObject *args, PyObject *keywords) PYDOC("(example[, format]) -> Value | distribution | (Value, distribution)") 
  • source/orange/multi_classifier.cpp

    r10968 r10970  
    3131#include "multi_classifier.ppp" 
    3232 
    33 DEFINE_TOrangeVector_classDescription(PClassifier, "TClassifierList", true, ORANGE_API) 
     33DEFINE_TOrangeVector_classDescription(PMultiClassifier, "TMultiClassifierList", true, ORANGE_API) 
    3434 
    35 /* ***** TClassifier methods */ 
     35/* ***** TMultiClassifier methods */ 
    3636 
    3737TMultiClassifier::TMultiClassifier(const PVarList &acv, const bool &cp) : 
     
    5050} 
    5151; 
    52 //TODO: ask janez how this is supposed to work, it seems like a deadlock to me 
     52 
    5353PValueList TMultiClassifier::operator ()(const TExample &exam) { 
    5454    if (!computesProbabilities) 
  • source/orange/multi_classifier.hpp

    r10968 r10970  
    3030WRAPPER(EFMDataDescription); 
    3131 
    32 //TODO: decide what to do with this 
    33 //#define TMultiClassifierList TOrangeVector<PMultiClassifier>  
    34 //VWRAPPER(MultiClassifierList) 
     32#define TMultiClassifierList TOrangeVector<PMultiClassifier>  
     33VWRAPPER(MultiClassifierList) 
    3534 
    3635/* Classifiers have three methods for classification. 
     
    4746public: 
    4847    __REGISTER_CLASS 
    49     //__REGISTER_ABSTRACT_CLASS TODO:?? 
    5048 
    5149    PVarList classVars; //P class variables 
  • source/orange/multi_learner.hpp

    r10968 r10970  
    3636public: 
    3737    __REGISTER_CLASS 
    38     //__REGISTER_ABSTRACT_CLASS TODO:??? 
    39  
    4038 
    4139    enum {NeedsNothing, NeedsClassDistribution, NeedsDomainDistribution, NeedsDomainContingency, NeedsExampleGenerator}; 
     
    4846    virtual PMultiClassifier operator()(PVarList); 
    4947    virtual PMultiClassifier operator()(PDistributionList); 
    50     virtual PMultiClassifier operator()(PDomainDistributions); //TODO: remove form header 
     48    virtual PMultiClassifier operator()(PDomainDistributions); 
    5149    virtual PMultiClassifier operator()(PDomainContingency); 
    5250    virtual PMultiClassifier operator()(PExampleGenerator, const int &weight = 0); 
  • source/orange/tdidt_clustering.cpp

    r10968 r10970  
    223223        for (j = 0; j < n_classes; ++j) { 
    224224            if (n_ptypes[i][j] == 0.0) 
    225                 ptypes[i][j] = INFINITY; //TODO: right? 
     225                ptypes[i][j] = INFINITY; 
    226226            else 
    227227                ptypes[i][j] = ptypes[i][j] / n_ptypes[i][j]; 
     
    809809        if((args.type == Classification && ogen->domain->classVars->at(i)->varType != TValue::INTVAR) || 
    810810            (args.type == Regression && ogen->domain->classVars->at(i)->varType == TValue::INTVAR)) 
    811             raiseError("all classes must be of the same type"); //TODO: correct? ask someone 
     811            raiseError("all classes must be of the same type"); //TODO: temporary? 
    812812    } 
    813813 
Note: See TracChangeset for help on using the changeset viewer.