Changeset 4614:722a11a23b2a in orange


Ignore:
Timestamp:
05/06/08 11:30:53 (6 years ago)
Author:
miha <miha.stajdohar@…>
Branch:
default
Convert:
a048d67896d785d16653f119241fecad2a093ea3
Message:

removed Numeric

Location:
source/orangeom
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • source/orangeom/network.cpp

    r4487 r4614  
    2525: TGraphAsList(graph->nVertices, graph->nEdgeTypes, graph->directed) 
    2626{ 
     27    cout << "TNetwork constructor" << endl; 
    2728  optimize.clear(); 
    2829  vector<int> vertices; 
  • source/orangeom/network.hpp

    r4441 r4614  
    7373    ~TNetworkHierarchy(); 
    7474    void setTop(vector<int> &vertices); 
    75   void addToNewMeta(vector<int> &vertices); 
     75    void addToNewMeta(vector<int> &vertices); 
    7676  void expandMeta(int meta); 
    7777  void printChilds(TNetworkHierarchyNode *node); 
     
    103103 
    104104  PExampleTable items; //P ExampleTable of vertices data 
     105  PExampleTable links; //P ExampleTable of edges data 
    105106  TNetworkHierarchy hierarchy; 
    106107  set<int> optimize; 
  • source/orangeom/networkoptimization.cpp

    r4531 r4614  
    2626{ 
    2727    //cout << "constructor" << endl; 
    28     //import_array(); 
     28    import_array(); 
    2929     
    3030    nVertices = 0; 
     
    3939    temperature = sqrt(width*width + height*height) / 10; 
    4040    coolFactor = 0.96; 
     41    //cout << "constructor end" << endl; 
    4142} 
    4243 
     
    5455    free_Carrayptrs(pos); 
    5556    Py_DECREF(coors); 
    56   Py_DECREF(metaCoors); 
     57    Py_DECREF(metaCoors); 
    5758} 
    5859 
     
    915916    if (PyArg_ParseTuple(args, "O:NetworkOptimization", &pygraph)) 
    916917    { 
     918        cout << "0" << endl; 
    917919        TGraphAsList *graph = &dynamic_cast<TGraphAsList &>(PyOrange_AsOrange(pygraph).getReference()); 
    918920 
     
    921923 
    922924        //return WrapNewOrange(new TGraphOptimization(graph->nVertices, pos, nLinks, links), type); 
     925        cout << "1" << endl; 
    923926        return WrapNewOrange(new TNetworkOptimization(), type); 
    924927    } 
    925928    else 
    926929    { 
     930        cout << "2" << endl;   
    927931        return WrapNewOrange(new TNetworkOptimization(), type); 
     932        cout << "3" << endl; 
    928933    } 
    929934  PyCATCH 
  • source/orangeom/networkoptimization.hpp

    r4531 r4614  
    106106    double *levelMin; 
    107107    double *levelMax; 
    108   TGraphAsTree *tree; 
     108    TGraphAsTree *tree; 
    109109   
    110110}; 
Note: See TracChangeset for help on using the changeset viewer.