Ignore:
Timestamp:
03/02/11 01:44:16 (3 years ago)
Author:
janezd <janez.demsar@…>
Branch:
default
Convert:
6ceaa13542b467cc96ac23a26920312a7075c442
Message:

Most C++ classes which are exported through the new modules now show the "correct" names.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • source/orange/lib_kernel.cpp

    r7685 r7715  
    124124PVarList PVarList_FromArguments(PyObject *arg) { return ListOfWrappedMethods<PVarList, TVarList, PVariable, &PyOrVariable_Type>::P_FromArguments(arg); } 
    125125PyObject *VarList_FromArguments(PyTypeObject *type, PyObject *arg) { return ListOfWrappedMethods<PVarList, TVarList, PVariable, &PyOrVariable_Type>::_FromArguments(type, arg); } 
    126 PyObject *VarList_new(PyTypeObject *type, PyObject *arg, PyObject *kwds) BASED_ON(Orange, "(<list of Variable>)") ALLOWS_EMPTY { return ListOfWrappedMethods<PVarList, TVarList, PVariable, &PyOrVariable_Type>::_new(type, arg, kwds); } 
     126PyObject *VarList_new(PyTypeObject *type, PyObject *arg, PyObject *kwds) BASED_ON(Orange - Orange.data.variable.Variables, "(<list of Variable>)") ALLOWS_EMPTY { return ListOfWrappedMethods<PVarList, TVarList, PVariable, &PyOrVariable_Type>::_new(type, arg, kwds); } 
    127127PyObject *VarList_getitem_sq(TPyOrange *self, Py_ssize_t index) { return ListOfWrappedMethods<PVarList, TVarList, PVariable, &PyOrVariable_Type>::_getitem(self, index); } 
    128128int       VarList_setitem_sq(TPyOrange *self, Py_ssize_t index, PyObject *item) { return ListOfWrappedMethods<PVarList, TVarList, PVariable, &PyOrVariable_Type>::_setitem(self, index, item); } 
     
    238238} 
    239239 
    240 ABSTRACT(Variable, Orange) 
    241 C_NAMED(EnumVariable, Variable, "([name=, values=, autoValues=, distributed=, getValueFrom=])") 
    242 C_NAMED(FloatVariable, Variable, "([name=, startValue=, endValue=, stepValue=, distributed=, getValueFrom=])") 
     240ABSTRACT(Variable - Orange.data.variable.Variable, Orange) 
     241C_NAMED(EnumVariable - Orange.data.variable.Discrete, Variable, "([name=, values=, autoValues=, distributed=, getValueFrom=])") 
     242C_NAMED(FloatVariable - Orange.data.variable.Continuous, Variable, "([name=, startValue=, endValue=, stepValue=, distributed=, getValueFrom=])") 
    243243 
    244244PyObject *PyVariable_MakeStatus_FromLong(long ok); 
     
    324324 
    325325#include "stringvars.hpp" 
    326 C_NAMED(StringVariable, Variable, "([name=])") 
     326C_NAMED(StringVariable - Orange.data.variable.String, Variable, "([name=])") 
    327327 
    328328#include "pythonvars.hpp" 
    329 C_NAMED(PythonVariable, Variable, "([name=])") 
     329C_NAMED(PythonVariable - Orange.data.variable.Python, Variable, "([name=])") 
    330330 
    331331PyObject *PythonValue_new(PyTypeObject *type, PyObject *args, PyObject *kwds) BASED_ON(SomeValue, "([object])") 
     
    13381338CONSTRUCTOR_KEYWORDS(Domain, "source") 
    13391339 
    1340 PyObject *Domain_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(Orange, "(list-of-attrs | domain [, hasClass | classVar | None] [,domain | list-of-attrs | source=domain])") 
     1340PyObject *Domain_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(Orange - Orange.data.Domain, "(list-of-attrs | domain [, hasClass | classVar | None] [,domain | list-of-attrs | source=domain])") 
    13411341{ PyTRY 
    13421342    PyObject *list; 
     
    29302930CONSTRUCTOR_KEYWORDS(ExampleTable, "domain use useMetas dontCheckStored dontStore filterMetas filter_metas DC DK NA noClass noCodedDiscrete createNewOn") 
    29312931 
    2932 PyObject *ExampleTable_new(PyTypeObject *type, PyObject *argstuple, PyObject *keywords) BASED_ON(ExampleGenerator, "(filename | domain[, examples] | examples)") 
     2932PyObject *ExampleTable_new(PyTypeObject *type, PyObject *argstuple, PyObject *keywords) BASED_ON(ExampleGenerator - Orange.data.Table, "(filename | domain[, examples] | examples)") 
    29332933{ 
    29342934  PyTRY 
     
    43034303NO_PICKLE(Distribution) 
    43044304 
    4305 PyObject *Distribution_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(SomeValue, "(attribute[, examples[, weightID]])") 
     4305PyObject *Distribution_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(SomeValue - Orange.statistics.distribution.Distribution, "(attribute[, examples[, weightID]])") 
    43064306{ 
    43074307  PyTRY 
     
    45554555 
    45564556 
    4557 PyObject *DiscDistribution_new(PyTypeObject *type, PyObject *targs, PyObject *) BASED_ON(Distribution, "[list of floats] | DiscDistribution") 
     4557PyObject *DiscDistribution_new(PyTypeObject *type, PyObject *targs, PyObject *) BASED_ON(Distribution - Orange.statistics.distribution.Discrete, "[list of floats] | DiscDistribution") 
    45584558{ PyTRY { 
    45594559    if (!PyTuple_Size(targs)) { 
     
    47334733 
    47344734 
    4735 PyObject *ContDistribution_new(PyTypeObject *type, PyObject *targs, PyObject *) BASED_ON(Distribution, "[dist of float:float] | DiscDistribution") 
     4735PyObject *ContDistribution_new(PyTypeObject *type, PyObject *targs, PyObject *) BASED_ON(Distribution - Orange.statistics.distribution.Continuous, "[dist of float:float] | DiscDistribution") 
    47364736{ PyTRY { 
    47374737 
     
    49854985 
    49864986 
    4987 PyObject *GaussianDistribution_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(Distribution, "(mean, sigma) | (distribution) | () -> distribution") ALLOWS_EMPTY 
     4987PyObject *GaussianDistribution_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(Distribution - Orange.statistics.distribution.Gaussian, "(mean, sigma) | (distribution) | () -> distribution") ALLOWS_EMPTY 
    49884988{ PyTRY 
    49894989    float mean = 0.0, sigma = 1.0; 
     
    50895089   parameters, while this one returns the same type, disregarding whether it was given examples or not. 
    50905090*/ 
    5091 PyObject *DomainDistributions_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(Orange, "(examples[, weightID, skipDiscrete, skipContinuous] | <list of Distribution>) -> DomainDistributions") ALLOWS_EMPTY 
     5091PyObject *DomainDistributions_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(Orange - Orange.statistics.distribution.Domain, "(examples[, weightID, skipDiscrete, skipContinuous] | <list of Distribution>) -> DomainDistributions") ALLOWS_EMPTY 
    50925092{ PyTRY 
    50935093    if (!args || !PyTuple_Size(args)) 
     
    52575257 
    52585258 
    5259 ABSTRACT(LearnerFD, Learner) 
    5260  
    5261 PyObject *Learner_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange, "<abstract>") 
     5259ABSTRACT(LearnerFD - Orange.classification.LearnerFD, Learner) 
     5260 
     5261PyObject *Learner_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.Learner, "<abstract>") 
    52625262{ if (type == (PyTypeObject *)&PyOrLearner_Type) 
    52635263    return setCallbackFunction(WrapNewOrange(mlnew TLearner_Python(), type), args); 
     
    53135313#include "majority.hpp" 
    53145314 
    5315 ABSTRACT(ClassifierFD, Classifier) 
    5316  
    5317 PyObject *DefaultClassifier_new(PyTypeObject *tpe, PyObject *args, PyObject *kw) BASED_ON(Classifier, "([defaultVal])") ALLOWS_EMPTY 
     5315ABSTRACT(ClassifierFD - Orange.classification.ClassifierFD, Classifier) 
     5316 
     5317PyObject *DefaultClassifier_new(PyTypeObject *tpe, PyObject *args, PyObject *kw) BASED_ON(Classifier - Orange.classification.ConstantClassifier, "([defaultVal])") ALLOWS_EMPTY 
    53185318{ 
    53195319  PyObject *arg1 = NULL, *arg2 = NULL; 
     
    53455345} 
    53465346 
    5347 C_NAMED(RandomLearner, Learner, "([probabilities=])") 
    5348 C_NAMED(RandomClassifier, Classifier, "([probabilities=])") 
     5347C_NAMED(RandomLearner - Orange.classification.RandomLearner, Learner, "([probabilities=])") 
     5348C_NAMED(RandomClassifier - Orange.classification.RandomClassifier, Classifier, "([probabilities=])") 
    53495349 
    53505350PClassifierList PClassifierList_FromArguments(PyObject *arg) { return ListOfWrappedMethods<PClassifierList, TClassifierList, PClassifier, &PyOrClassifier_Type>::P_FromArguments(arg); } 
    53515351PyObject *ClassifierList_FromArguments(PyTypeObject *type, PyObject *arg) { return ListOfWrappedMethods<PClassifierList, TClassifierList, PClassifier, &PyOrClassifier_Type>::_FromArguments(type, arg); } 
    5352 PyObject *ClassifierList_new(PyTypeObject *type, PyObject *arg, PyObject *kwds) BASED_ON(Orange, "(<list of Classifier>)")  ALLOWS_EMPTY { return ListOfWrappedMethods<PClassifierList, TClassifierList, PClassifier, &PyOrClassifier_Type>::_new(type, arg, kwds); } 
     5352PyObject *ClassifierList_new(PyTypeObject *type, PyObject *arg, PyObject *kwds) BASED_ON(Orange - Orange.classification.ClassifierList, "(<list of Classifier>)")  ALLOWS_EMPTY { return ListOfWrappedMethods<PClassifierList, TClassifierList, PClassifier, &PyOrClassifier_Type>::_new(type, arg, kwds); } 
    53535353PyObject *ClassifierList_getitem_sq(TPyOrange *self, Py_ssize_t index) { return ListOfWrappedMethods<PClassifierList, TClassifierList, PClassifier, &PyOrClassifier_Type>::_getitem(self, index); } 
    53545354int       ClassifierList_setitem_sq(TPyOrange *self, Py_ssize_t index, PyObject *item) { return ListOfWrappedMethods<PClassifierList, TClassifierList, PClassifier, &PyOrClassifier_Type>::_setitem(self, index, item); } 
     
    53885388 
    53895389 
    5390 PyObject *Classifier_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange, "<abstract>") 
     5390PyObject *Classifier_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.classification.Classifier, "<abstract>") 
    53915391{ if (type == (PyTypeObject *)&PyOrClassifier_Type) 
    53925392    return setCallbackFunction(WrapNewOrange(mlnew TClassifier_Python(), type), args); 
     
    54615461 
    54625462#include "classfromvar.hpp" 
    5463 C_NAMED(ClassifierFromVar, Classifier, "([whichVar=, transformer=])") 
    5464 C_NAMED(ClassifierFromVarFD, ClassifierFD, "([position=, transformer=])") 
     5463C_NAMED(ClassifierFromVar - Orange.classification.ClassifierFromVar, Classifier, "([whichVar=, transformer=])") 
     5464C_NAMED(ClassifierFromVarFD - Orange.classification.ClassifierFromVarFD, ClassifierFD, "([position=, transformer=])") 
    54655465 
    54665466#include "cartesian.hpp" 
    5467 C_NAMED(CartesianClassifier, ClassifierFD, "()") 
     5467C_NAMED(CartesianClassifier - Orange.classification.CartesianClassifier, ClassifierFD, "()") 
    54685468 
    54695469 
     
    54725472#include "lookup.hpp" 
    54735473 
    5474 C_CALL(LookupLearner, Learner, "([examples] [, weight=]) -/-> Classifier") 
    5475 C_NAMED(ClassifierByExampleTable, ClassifierFD, "([examples=])") 
     5474C_CALL(LookupLearner - Orange.classification.lookup.LookupLearner, Learner, "([examples] [, weight=]) -/-> Classifier") 
     5475C_NAMED(ClassifierByExampleTable - Orange.classification.lookup.ClassifierByDataTable, ClassifierFD, "([examples=])") 
    54765476 
    54775477 
     
    55955595 
    55965596 
    5597 PyObject *ClassifierByLookupTable1_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(ClassifierByLookupTable, "(class-descriptor, descriptor)") 
     5597PyObject *ClassifierByLookupTable1_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(ClassifierByLookupTable - Orange.classification.lookup.ClassifierByLookupTable1, "(class-descriptor, descriptor)") 
    55985598{ PyTRY 
    55995599    PVariable vcl, vvl; 
     
    56215621 
    56225622 
    5623 PyObject *ClassifierByLookupTable2_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(ClassifierByLookupTable, "(class-descriptor, desc0, desc1)") 
     5623PyObject *ClassifierByLookupTable2_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(ClassifierByLookupTable - Orange.classification.lookup.ClassifierByLookupTable2, "(class-descriptor, desc0, desc1)") 
    56245624{ PyTRY 
    56255625    PVariable vcl, vvl1, vvl2; 
     
    56485648 
    56495649 
    5650 PyObject *ClassifierByLookupTable3_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(ClassifierByLookupTable, "(class-descriptor, desc0, desc1, desc2)") 
     5650PyObject *ClassifierByLookupTable3_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(ClassifierByLookupTable - Orange.classification.lookup.ClassifierByLookupTable3, "(class-descriptor, desc0, desc1, desc2)") 
    56515651{ PyTRY 
    56525652    PVariable vcl, vvl1, vvl2, vvl3; 
     
    56765676 
    56775677 
    5678 PyObject *ClassifierByLookupTable_new(PyTypeObject *type, PyObject *args, PyObject *kwds) BASED_ON(Classifier, "(class-descriptor, descriptor)") 
     5678PyObject *ClassifierByLookupTable_new(PyTypeObject *type, PyObject *args, PyObject *kwds) BASED_ON(Classifier - Orange.classification.lookup.ClassifierByLookupTable, "(class-descriptor, descriptor)") 
    56795679{ 
    56805680  static newfunc constructors[] = {ClassifierByLookupTable1_new, ClassifierByLookupTable2_new, ClassifierByLookupTable3_new}; 
Note: See TracChangeset for help on using the changeset viewer.