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_components.cpp

    r7665 r7715  
    152152 
    153153 
    154 PyObject *CostMatrix_new(PyTypeObject *type, PyObject *args) BASED_ON(Orange, "(list-of-list-of-prices) -> CostMatrix") 
     154PyObject *CostMatrix_new(PyTypeObject *type, PyObject *args) BASED_ON(Orange - Orange.classification.CostMatrix, "(list-of-list-of-prices) -> CostMatrix") 
    155155{ 
    156156    PyTRY 
     
    291291#include "basstat.hpp" 
    292292 
    293 PyObject *BasicAttrStat_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(Orange, "(variable, [examples, weightID, min=, max=, avg=, dev=, n=]) -> BasicAttrStat") ALLOWS_EMPTY 
     293PyObject *BasicAttrStat_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(Orange - Orange.statistics.basic.Variable, "(variable, [examples, weightID, min=, max=, avg=, dev=, n=]) -> BasicAttrStat") ALLOWS_EMPTY 
    294294{ 
    295295  PyTRY 
     
    381381parameters, while this one returns the same type, disregarding whether it was given examples or not. 
    382382*/ 
    383 PyObject *DomainBasicAttrStat_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(Orange, "(examples | <list of BasicAttrStat>) -> DomainBasicAttrStat") ALLOWS_EMPTY 
     383PyObject *DomainBasicAttrStat_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(Orange - Orange.statistics.basic.Domain, "(examples | <list of BasicAttrStat>) -> DomainBasicAttrStat") ALLOWS_EMPTY 
    384384{ PyTRY 
    385385if (!args || !PyTuple_Size(args)) 
     
    503503#include "estimateprob.hpp" 
    504504 
    505 ABSTRACT(ContingencyClass, Contingency) 
     505ABSTRACT(ContingencyClass - Orange.statistics.contingency.Class, Contingency) 
    506506 
    507507PDistribution *Contingency_getItemRef(PyObject *self, PyObject *index) 
     
    545545 
    546546 
    547 PyObject *Contingency_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(Orange, "(outer_desc, inner_desc)") 
     547PyObject *Contingency_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(Orange - Orange.statistics.contingency.Table, "(outer_desc, inner_desc)") 
    548548{ PyTRY 
    549549PVariable var1, var2; 
     
    763763 
    764764 
    765 PyObject *ContingencyAttrClass_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(ContingencyClass, "(attribute, class attribute) | (attribute, examples[, weightID])") 
     765PyObject *ContingencyAttrClass_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(ContingencyClass - Orange.statistics.contingency.VarClass, "(attribute, class attribute) | (attribute, examples[, weightID])") 
    766766{ PyTRY 
    767767PVariable var1, var2; 
     
    818818 
    819819 
    820 PyObject *ContingencyClassAttr_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(ContingencyClass, "(attribute, class attribute) | (attribute, examples[, weightID])") 
     820PyObject *ContingencyClassAttr_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(ContingencyClass - Orange.statistics.contingency.ClassVar, "(attribute, class attribute) | (attribute, examples[, weightID])") 
    821821{ PyTRY 
    822822PVariable var1, var2; 
     
    874874 
    875875 
    876 PyObject *ContingencyAttrAttr_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(Contingency, "(outer_attr, inner_attr[, examples [, weight-id]])") 
     876PyObject *ContingencyAttrAttr_new(PyTypeObject *type, PyObject *args, PyObject *) BASED_ON(Contingency - Orange.statistics.contingency.VarVar, "(outer_attr, inner_attr[, examples [, weight-id]])") 
    877877{ PyTRY 
    878878PyObject *pyvar, *pyinvar; 
     
    11701170CONSTRUCTOR_KEYWORDS(DomainContingency, "classIsOuter class_is_outer") 
    11711171 
    1172 PyObject *DomainContingency_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(Orange, "(examples [, weightID] | <list of Contingency>) -> DomainContingency") ALLOWS_EMPTY 
     1172PyObject *DomainContingency_new(PyTypeObject *type, PyObject *args, PyObject *keywds) BASED_ON(Orange - Orange.statistics.contingency.Domain, "(examples [, weightID] | <list of Contingency>) -> DomainContingency") ALLOWS_EMPTY 
    11731173{ PyTRY 
    11741174if (!args || !PyTuple_Size(args)) 
     
    13591359#include "distance_dtw.hpp" 
    13601360 
    1361 ABSTRACT(ExamplesDistance_Normalized, ExamplesDistance) 
    1362 C_NAMED(ExamplesDistance_Hamming, ExamplesDistance, "()") 
    1363 C_NAMED(ExamplesDistance_Maximal, ExamplesDistance_Normalized, "()") 
    1364 C_NAMED(ExamplesDistance_Manhattan, ExamplesDistance_Normalized, "()") 
    1365 C_NAMED(ExamplesDistance_Euclidean, ExamplesDistance_Normalized, "()") 
    1366 C_NAMED(ExamplesDistance_Relief, ExamplesDistance, "()") 
    1367 C_NAMED(ExamplesDistance_DTW, ExamplesDistance_Normalized, "()") 
    1368  
    1369 C_CALL(ExamplesDistanceConstructor_Hamming, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Hamming") 
    1370 C_CALL(ExamplesDistanceConstructor_Maximal, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Maximal") 
    1371 C_CALL(ExamplesDistanceConstructor_Manhattan, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Manhattan") 
    1372 C_CALL(ExamplesDistanceConstructor_Euclidean, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Euclidean") 
    1373 C_CALL(ExamplesDistanceConstructor_Relief, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Relief") 
    1374 C_CALL(ExamplesDistanceConstructor_DTW, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_DTW") 
    1375  
    1376  
    1377 PyObject *ExamplesDistanceConstructor_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange, "<abstract>") 
     1361ABSTRACT(ExamplesDistance_Normalized - Orange.distances.ExamplesDistance_Normalized, ExamplesDistance) 
     1362C_NAMED(ExamplesDistance_Hamming - Orange.distances.Hamming, ExamplesDistance, "()") 
     1363C_NAMED(ExamplesDistance_Maximal - Orange.distances.Maximal, ExamplesDistance_Normalized, "()") 
     1364C_NAMED(ExamplesDistance_Manhattan - Orange.distances.Manhattan, ExamplesDistance_Normalized, "()") 
     1365C_NAMED(ExamplesDistance_Euclidean - Orange.distances.Euclidean, ExamplesDistance_Normalized, "()") 
     1366C_NAMED(ExamplesDistance_Relief - Orange.distances.Relief, ExamplesDistance, "()") 
     1367C_NAMED(ExamplesDistance_DTW - Orange.distances.DTW, ExamplesDistance_Normalized, "()") 
     1368 
     1369C_CALL(ExamplesDistanceConstructor_Hamming - Orange.distances.HammingConstructor, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Hamming") 
     1370C_CALL(ExamplesDistanceConstructor_Maximal - Orange.distances.MaximalConstructor, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Maximal") 
     1371C_CALL(ExamplesDistanceConstructor_Manhattan - Orange.distances.ManhattanConstructor, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Manhattan") 
     1372C_CALL(ExamplesDistanceConstructor_Euclidean - Orange.distances.EuclideanConstructor, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Euclidean") 
     1373C_CALL(ExamplesDistanceConstructor_Relief - Orange.distances.ReliefConstructor, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_Relief") 
     1374C_CALL(ExamplesDistanceConstructor_DTW - Orange.distances.DTWConstructor, ExamplesDistanceConstructor, "([examples, weightID][, DomainDistributions][, DomainBasicAttrStat]) -/-> ExamplesDistance_DTW") 
     1375 
     1376 
     1377PyObject *ExamplesDistanceConstructor_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.distances.ExamplesDistanceConstructor, "<abstract>") 
    13781378{ 
    13791379  if (type == (PyTypeObject *)&PyOrExamplesDistanceConstructor_Type) 
     
    13901390 
    13911391 
    1392 PyObject *ExamplesDistance_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange, "<abstract>") 
     1392PyObject *ExamplesDistance_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.distances.ExamplesDistance, "<abstract>") 
    13931393{ if (type == (PyTypeObject *)&PyOrExamplesDistance_Type) 
    13941394return setCallbackFunction(WrapNewOrange(mlnew TExamplesDistance_Python(), type), args); 
     
    15261526#include "nearest.hpp" 
    15271527 
    1528 ABSTRACT(FindNearest, Orange) 
    1529 C_NAMED(FindNearest_BruteForce, FindNearest, "([distance=, distanceID=, includeSame=])") 
    1530  
    1531 ABSTRACT(FindNearestConstructor, Orange) 
    1532 C_CALL(FindNearestConstructor_BruteForce, FindNearestConstructor, "([examples[, weightID[, distanceID]], distanceConstructor=, includeSame=]) -/-> FindNearest") 
     1528ABSTRACT(FindNearest - Orange.core.FindNearest, Orange) 
     1529C_NAMED(FindNearest_BruteForce - Orange.classification.knn.FindNearest, FindNearest, "([distance=, distanceID=, includeSame=])") 
     1530 
     1531ABSTRACT(FindNearestConstructor - Orange.core.FindNearestConstructor, Orange) 
     1532C_CALL(FindNearestConstructor_BruteForce - Orange.classification.knn.FindNearestConstructor, FindNearestConstructor, "([examples[, weightID[, distanceID]], distanceConstructor=, includeSame=]) -/-> FindNearest") 
    15331533 
    15341534 
     
    19981998C_NAMED(TransformValue_IsDefined, TransformValue, "([value=])") 
    19991999 
    2000 ABSTRACT(Imputer, Orange) 
    2001 C_NAMED(Imputer_asValue, Imputer, "() -> Imputer_asValue") 
    2002 C_NAMED(Imputer_model, Imputer, "() -> Imputer_model") 
    2003 C_NAMED(Imputer_random, Imputer, "() -> Imputer_random") 
    2004  
    2005 PyObject *Imputer_defaults_new(PyTypeObject *tpe, PyObject *args) BASED_ON(Imputer, "(domain | example) -> Imputer_defaults") 
     2000ABSTRACT(Imputer - Orange.feature.imputation.Imputer, Orange) 
     2001C_NAMED(Imputer_asValue - Orange.feature.imputation.Imputer_asValue, Imputer, "() -> Imputer_asValue") 
     2002C_NAMED(Imputer_model - Orange.feature.imputation.Imputer_model, Imputer, "() -> Imputer_model") 
     2003C_NAMED(Imputer_random - Orange.feature.imputation.Imputer_random, Imputer, "() -> Imputer_random") 
     2004 
     2005PyObject *Imputer_defaults_new(PyTypeObject *tpe, PyObject *args) BASED_ON(Imputer - Orange.feature.imputation.Imputer_defaults, "(domain | example) -> Imputer_defaults") 
    20062006{ 
    20072007    PyTRY 
     
    20282028 
    20292029 
    2030 ABSTRACT(ImputerConstructor, Orange) 
    2031 C_CALL(ImputerConstructor_average, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
    2032 C_CALL(ImputerConstructor_minimal, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
    2033 C_CALL(ImputerConstructor_maximal, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
    2034 C_CALL(ImputerConstructor_model, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
    2035 C_CALL(ImputerConstructor_asValue, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
    2036 C_CALL(ImputerConstructor_random, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
     2030ABSTRACT(ImputerConstructor - Orange.feature.imputation.ImputerConstructor, Orange) 
     2031C_CALL(ImputerConstructor_average - Orange.feature.imputation.ImputerConstructor_average, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
     2032C_CALL(ImputerConstructor_minimal - Orange.feature.imputation.ImputerConstructor_minimal, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
     2033C_CALL(ImputerConstructor_maximal - Orange.feature.imputation.ImputerConstructor_maximal, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
     2034C_CALL(ImputerConstructor_model - Orange.feature.imputation.ImputerConstructor_model, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
     2035C_CALL(ImputerConstructor_asValue - Orange.feature.imputation.ImputerConstructor_asValue, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
     2036C_CALL(ImputerConstructor_random - Orange.feature.imputation.ImputerConstructor_random, ImputerConstructor, "(examples[, weightID]) -> Imputer") 
    20372037 
    20382038PyObject *Imputer_call(PyObject *self, PyObject *args, PyObject *keywords) 
     
    20792079#include "trindex.hpp" 
    20802080 
    2081 ABSTRACT(MakeRandomIndices, Orange) 
    2082 C_CALL3(MakeRandomIndices2, MakeRandomIndices2, MakeRandomIndices, "[n | gen [, p0]], [p0=, stratified=, randseed=] -/-> [int]") 
    2083 C_CALL3(MakeRandomIndicesMultiple, MakeRandomIndicesMultiple, MakeRandomIndices, "[n | gen [, p]], [p=, stratified=, randseed=] -/-> [int]") 
    2084 C_CALL3(MakeRandomIndicesN, MakeRandomIndicesN, MakeRandomIndices, "[n | gen [, p]], [p=, stratified=, randseed=] -/-> [int]") 
    2085 C_CALL3(MakeRandomIndicesCV, MakeRandomIndicesCV, MakeRandomIndices, "[n | gen [, folds]], [folds=, stratified=, randseed=] -/-> [int]") 
     2081ABSTRACT(MakeRandomIndices - Orange.data.sample.MakeRandomIndices, Orange) 
     2082C_CALL3(MakeRandomIndices2 - Orange.data.sample.MakeRandomIndices2, MakeRandomIndices2, MakeRandomIndices, "[n | gen [, p0]], [p0=, stratified=, randseed=] -/-> [int]") 
     2083C_CALL3(MakeRandomIndicesMultiple - Orange.data.sample.MakeRandomIndicesMultiple, MakeRandomIndicesMultiple, MakeRandomIndices, "[n | gen [, p]], [p=, stratified=, randseed=] -/-> [int]") 
     2084C_CALL3(MakeRandomIndicesN - Orange.data.sample.MakeRandomIndicesN, MakeRandomIndicesN, MakeRandomIndices, "[n | gen [, p]], [p=, stratified=, randseed=] -/-> [int]") 
     2085C_CALL3(MakeRandomIndicesCV - Orange.data.sample.MakeRandomIndicesCV, MakeRandomIndicesCV, MakeRandomIndices, "[n | gen [, folds]], [folds=, stratified=, randseed=] -/-> [int]") 
    20862086 
    20872087 
     
    25812581#include "relief.hpp" 
    25822582 
    2583 BASED_ON(MeasureAttribute, Orange) 
    2584 ABSTRACT(MeasureAttributeFromProbabilities, MeasureAttribute) 
    2585  
    2586 C_CALL(MeasureAttribute_info, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori) -/-> float") 
    2587 C_CALL(MeasureAttribute_gini, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori) -/-> float") 
    2588 C_CALL(MeasureAttribute_gainRatio, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori) -/-> float") 
    2589 C_CALL(MeasureAttribute_gainRatioA, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori) -/-> float") 
    2590 C_CALL(MeasureAttribute_cost, MeasureAttributeFromProbabilities, "(cost=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
    2591 C_CALL(MeasureAttribute_relevance, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
    2592 C_CALL(MeasureAttribute_logOddsRatio, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
    2593 C_CALL(MeasureAttribute_chiSquare, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
    2594  
    2595 C_CALL(MeasureAttribute_MSE, MeasureAttribute, "(estimate=, m=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
    2596  
    2597 C_CALL(MeasureAttribute_relief, MeasureAttribute, "(estimate=, m=, k=) | (attr, examples[, apriori] [,weightID]) -/-> float") 
     2583BASED_ON(MeasureAttribute - Orange.feature.scoring.Measure, Orange) 
     2584ABSTRACT(MeasureAttributeFromProbabilities - Orange.core.MeasureAttributeFromProbabilities, MeasureAttribute) 
     2585 
     2586C_CALL(MeasureAttribute_info - Orange.feature.scoring.InfoGain, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori) -/-> float") 
     2587C_CALL(MeasureAttribute_gini - Orange.feature.scoring.Gini, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori) -/-> float") 
     2588C_CALL(MeasureAttribute_gainRatio - Orange.feature.scoring.GainRatio, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori) -/-> float") 
     2589C_CALL(MeasureAttribute_gainRatioA - Orange.core.MeasureAttribute_gainRatioA, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori) -/-> float") 
     2590C_CALL(MeasureAttribute_cost - Orange.feature.scoring.Cost, MeasureAttributeFromProbabilities, "(cost=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
     2591C_CALL(MeasureAttribute_relevance - Orange.feature.scoring.Relevance, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
     2592C_CALL(MeasureAttribute_logOddsRatio - Orange.core.MeasureAttribute_logOddsRatio, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
     2593C_CALL(MeasureAttribute_chiSquare - Orange.feature.scoring.MeasureAttribute_chiSquare, MeasureAttributeFromProbabilities, "(estimate=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
     2594 
     2595C_CALL(MeasureAttribute_MSE - Orange.feature.scoring.MSE, MeasureAttribute, "(estimate=, m=) | (attr, examples[, apriori] [,weightID]) | (attrno, domain-cont[, apriori]) | (cont, class dist [,apriori]) -/-> float") 
     2596 
     2597C_CALL(MeasureAttribute_relief - Orange.feature.scoring.Relief, MeasureAttribute, "(estimate=, m=, k=) | (attr, examples[, apriori] [,weightID]) -/-> float") 
    25982598 
    25992599/* obsolete: */ 
     
    26042604PYCLASSCONSTANT_FLOAT(MeasureAttribute, Rejected, ATTRIBUTE_REJECTED) 
    26052605 
    2606 PyObject *MeasureAttribute_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange, "<abstract>") 
     2606PyObject *MeasureAttribute_new(PyTypeObject *type, PyObject *args, PyObject *keywords)  BASED_ON(Orange - Orange.feature.scoring.Measure, "<abstract>") 
    26072607{ if (type == (PyTypeObject *)&PyOrMeasureAttribute_Type) 
    26082608return setCallbackFunction(WrapNewOrange(mlnew TMeasureAttribute_Python(), type), args); 
     
    28732873#include "exampleclustering.hpp" 
    28742874 
    2875 ABSTRACT(GeneralExampleClustering, Orange) 
    2876 C_NAMED(ExampleCluster, Orange, "([left=, right=, distance=, centroid=])") 
    2877 C_NAMED(ExampleClusters, GeneralExampleClustering, "([root=, quality=]") 
     2875ABSTRACT(GeneralExampleClustering - Orange.core.GeneralExampleClustering, Orange) 
     2876C_NAMED(ExampleCluster - Orange.clustering.ExampleCluster, Orange, "([left=, right=, distance=, centroid=])") 
     2877C_NAMED(ExampleClusters - Orange.core.ExampleClusters, GeneralExampleClustering, "([root=, quality=]") 
    28782878 
    28792879 
     
    29242924#include "calibrate.hpp" 
    29252925 
    2926 C_CALL(ThresholdCA, Orange, "([classifier, examples[, weightID, target value]]) -/-> (threshold, optimal CA, list of CAs))") 
     2926C_CALL(ThresholdCA - Orange.wrappers.ThresholdCA, Orange, "([classifier, examples[, weightID, target value]]) -/-> (threshold, optimal CA, list of CAs))") 
    29272927 
    29282928PyObject *ThresholdCA_call(PyObject *self, PyObject *args, PyObject *keywords) PYDOC("(classifier, examples[, weightID, target value]) -> (threshold, optimal CA, list of CAs)") 
     
    35393539#include "hclust.hpp" 
    35403540 
    3541 C_NAMED(HierarchicalCluster, Orange, "()") 
    3542 C_CALL3(HierarchicalClustering, HierarchicalClustering, Orange, "(linkage=)") 
     3541C_NAMED(HierarchicalCluster - Orange.clustering.hierarchical.HierarchicalCluster, Orange, "()") 
     3542C_CALL3(HierarchicalClustering - Orange.clustering.hierarchical.HierarchicalClustering, HierarchicalClustering, Orange, "(linkage=)") 
    35433543 
    35443544PyObject *HierarchicalClustering_call(PyObject *self, PyObject *args, PyObject *keywords) PYDOC("(distance matrix) -> HierarchicalCluster") 
     
    36953695PHierarchicalClusterList PHierarchicalClusterList_FromArguments(PyObject *arg) { return ListOfWrappedMethods<PHierarchicalClusterList, THierarchicalClusterList, PHierarchicalCluster, &PyOrHierarchicalCluster_Type>::P_FromArguments(arg); } 
    36963696PyObject *HierarchicalClusterList_FromArguments(PyTypeObject *type, PyObject *arg) { return ListOfWrappedMethods<PHierarchicalClusterList, THierarchicalClusterList, PHierarchicalCluster, &PyOrHierarchicalCluster_Type>::_FromArguments(type, arg); } 
    3697 PyObject *HierarchicalClusterList_new(PyTypeObject *type, PyObject *arg, PyObject *kwds) BASED_ON(Orange, "(<list of HierarchicalCluster>)") ALLOWS_EMPTY { return ListOfWrappedMethods<PHierarchicalClusterList, THierarchicalClusterList, PHierarchicalCluster, &PyOrHierarchicalCluster_Type>::_new(type, arg, kwds); } 
     3697PyObject *HierarchicalClusterList_new(PyTypeObject *type, PyObject *arg, PyObject *kwds) BASED_ON(Orange - Orange.clustering.hierarchical.HierarchicalClusterList, "(<list of HierarchicalCluster>)") ALLOWS_EMPTY { return ListOfWrappedMethods<PHierarchicalClusterList, THierarchicalClusterList, PHierarchicalCluster, &PyOrHierarchicalCluster_Type>::_new(type, arg, kwds); } 
    36983698PyObject *HierarchicalClusterList_getitem_sq(TPyOrange *self, Py_ssize_t index) { return ListOfWrappedMethods<PHierarchicalClusterList, THierarchicalClusterList, PHierarchicalCluster, &PyOrHierarchicalCluster_Type>::_getitem(self, index); } 
    36993699int       HierarchicalClusterList_setitem_sq(TPyOrange *self, Py_ssize_t index, PyObject *item) { return ListOfWrappedMethods<PHierarchicalClusterList, THierarchicalClusterList, PHierarchicalCluster, &PyOrHierarchicalCluster_Type>::_setitem(self, index, item); } 
     
    37253725#include "distancemap.hpp" 
    37263726 
    3727 C_NAMED(DistanceMapConstructor, Orange, "(distanceMatrix=, order=)") 
     3727C_NAMED(DistanceMapConstructor - Orange.distances.DistanceMapConstructor, Orange, "(distanceMatrix=, order=)") 
    37283728 
    37293729 
     
    37623762 
    37633763 
    3764 BASED_ON(DistanceMap, Orange) 
     3764BASED_ON(DistanceMap - Orange.distances.DistanceMap, Orange) 
    37653765 
    37663766PyObject *DistanceMap__reduce__(PyObject *self) 
     
    43284328 
    43294329 
    4330 ABSTRACT(Graph, Orange) 
     4330ABSTRACT(Graph - Orange.network.Graph, Orange) 
    43314331RECOGNIZED_ATTRIBUTES(Graph, "objects forceMapping force_mapping returnIndices return_indices objectsOnEdges object_on_edges") 
    43324332 
     
    54905490} 
    54915491 
    5492 PyObject *GraphAsMatrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds) BASED_ON(Graph, "(nVertices, directed[, nEdgeTypes])") 
     5492PyObject *GraphAsMatrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds) BASED_ON(Graph - Orange.network.GraphAsMatrix, "(nVertices, directed[, nEdgeTypes])") 
    54935493{ 
    54945494    PyTRY 
     
    55845584 
    55855585 
    5586 PyObject *GraphAsList_new(PyTypeObject *type, PyObject *args, PyObject *kwds) BASED_ON(Graph, "(nVertices, directed[, nEdgeTypes])") 
     5586PyObject *GraphAsList_new(PyTypeObject *type, PyObject *args, PyObject *kwds) BASED_ON(Graph - Orange.network.GraphAsList, "(nVertices, directed[, nEdgeTypes])") 
    55875587{ 
    55885588    PyTRY 
     
    57065706 
    57075707 
    5708 PyObject *GraphAsTree_new(PyTypeObject *type, PyObject *args, PyObject *kwds) BASED_ON(Graph, "(nVertices, directed[, nEdgeTypes])") 
     5708PyObject *GraphAsTree_new(PyTypeObject *type, PyObject *args, PyObject *kwds) BASED_ON(Graph - Orange.network.GraphAsTree, "(nVertices, directed[, nEdgeTypes])") 
    57095709{ 
    57105710    PyTRY 
Note: See TracChangeset for help on using the changeset viewer.