Changeset 6963:13450016cefe in orange


Ignore:
Timestamp:
08/31/10 13:34:01 (4 years ago)
Author:
ales_erjavec <ales.erjavec@…>
Branch:
default
Convert:
9895eb0bc63a66bae56f58de99273aca05ae2439
Message:
  • Fixed a problem with compiling orange on Mac for python2.7 (conflict between isspace, isupper ... defined in <localefwd> and <ctypes.h>. Fixed by moving #include <iostream> and simmilar includes before other includes or removing it if not necessary).
Location:
source/orange
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • source/orange/assoc.hpp

    r6952 r6963  
    11/* 
    22    This file is part of Orange. 
    3      
     3         
    44    Copyright 1996-2010 Faculty of Computer and Information Science, University of Ljubljana 
    55    Contact: janez.demsar@fri.uni-lj.si 
     
    2222#ifndef _ASSOC_HPP 
    2323#define _ASSOC_HPP 
    24  
    25 #include <iostream> 
    2624 
    2725#include "stladdon.hpp" 
  • source/orange/getarg.cpp

    r6531 r6963  
    1919*/ 
    2020 
    21  
     21#include <iostream> 
     22#include <fstream> 
    2223#include "getarg.hpp" 
    2324#include "stladdon.hpp" 
    2425#include "errors.hpp" 
    25 #include <iostream> 
    26 #include <fstream> 
    2726#include <stdio.h> 
    2827 
     
    8079    have (one) parameter. */ 
    8180void TProgArguments::findPossibleOptions(const string &poss_options) 
    82 {  
     81{ 
    8382  string ops; 
    8483  string::const_iterator chi=poss_options.begin(); 
     
    9695      if (chi==poss_options.end()) break; 
    9796      ops= *(chi++); 
    98     }  
     97    } 
    9998 
    10099    else ops+= *(chi++); 
     
    134133          unrecognized.insert(pair<string, string>(option, par)); 
    135134        else if (possibleOptions[option]) options.insert(pair<string, string>(option, par)); 
    136         else  
     135        else 
    137136          raiseError("option '%s' expects no arguments", option.c_str()); 
    138137      } 
     
    200199  if ((line[0]=='"') && (line[line.length()-1]=='"')) { 
    201200    char buff[1024], *curr=buff; 
    202      
     201 
    203202    for(int i=1, llen = line.length(); i+1<llen;) 
    204203      if (line[i]=='"') { 
     
    224223 
    225224  return atoms.size(); 
    226 }      
     225} 
    227226 
    228227 
  • source/orange/graph.cpp

    r6795 r6963  
    11/* 
    22    This file is part of Orange. 
    3      
     3 
    44    Copyright 1996-2010 Faculty of Computer and Information Science, University of Ljubljana 
    55    Contact: janez.demsar@fri.uni-lj.si 
     
    2121#include <algorithm> 
    2222#include <limits> 
     23#include <iterator> 
     24#include <iostream> 
     25 
    2326#include "graph.ppp" 
    24 #include <iterator> 
    2527 
    2628double _disconbuf = numeric_limits<double>::quiet_NaN(); 
  • source/orange/graph.hpp

    r6531 r6963  
    11/* 
    22    This file is part of Orange. 
    3      
     3 
    44    Copyright 1996-2010 Faculty of Computer and Information Science, University of Ljubljana 
    55    Contact: janez.demsar@fri.uni-lj.si 
     
    2525#include <stdio.h> 
    2626#include "stdlib.h" 
    27 #include <iostream> 
    2827#include <set> 
    2928#include <queue> 
     
    165164  void getNeighbours_Undirected(const int &v, const int &edgeType, vector<int> &neighbours); 
    166165}; 
    167    
     166 
    168167 
    169168class ORANGE_API TGraphAsTree : public TGraph 
  • source/orange/lib_components.cpp

    r6886 r6963  
    31353135 
    31363136    PyObject* components_list = PyList_New(0); 
    3137      
     3137 
    31383138    for (i = 0; i < closest.size(); i++) { 
    31393139        PyObject *nel = Py_BuildValue("i", closest[i]); 
     
    53875387{ 
    53885388  PyTRY 
    5389     cout << "clustering C++" << endl; 
     5389    //cout << "clustering C++" << endl; 
    53905390      /* 
    53915391      if (!PyArg_ParseTuple(args, ":NetworkOptimization.getClusters", )) 
  • source/orange/linear.cpp

    r6796 r6963  
    15611561} 
    15621562 
    1563 #include <iostream> 
    15641563struct NodeSort{ 
    15651564    bool operator () (const feature_node &lhs, const feature_node &rhs){ 
  • source/orange/rule_conditions.cpp

    r6531 r6963  
    11/* 
    22    This file is part of Orange. 
    3      
     3 
    44    Copyright 1996-2010 Faculty of Computer and Information Science, University of Ljubljana 
    55    Contact: janez.demsar@fri.uni-lj.si 
     
    1919*/ 
    2020 
     21#include <istream> 
     22#include <string> 
    2123 
    2224#include "stladdon.hpp" 
     
    4143 
    4244bool TRuleCondAtom::operator()(PExample example) 
    43 { return    (example->operator[](attrIndex).isSpecial())  
     45{ return    (example->operator[](attrIndex).isSpecial()) 
    4446         || (valueIndex>=0) && (example->operator[](attrIndex).intV!=valueIndex) ? 0 : 1; } 
    4547 
     
    5355bool TRuleCondOneOf::operator()(PExample example) 
    5456{ ITERATE(vector<int>, ai, attrIndices) 
    55     if (!example->operator[](*ai).isSpecial())  return true;  
     57    if (!example->operator[](*ai).isSpecial())  return true; 
    5658  return false; } 
    5759 
     
    9395    } 
    9496  } 
    95    
     97 
    9698  vector<string>::iterator ii(atoms.begin()+1); 
    9799  for( ; ii!=atoms.end(); ii++) { 
     
    123125int TRuleCondCounted::count(PExample example) 
    124126{ int occs=0; 
    125   for(vector<TCondition<PExample> *>::iterator ci(atomConditions.begin()); ci!=atomConditions.end(); occs+=(**(ci++))(example));  
    126   return occs;  
     127  for(vector<TCondition<PExample> *>::iterator ci(atomConditions.begin()); ci!=atomConditions.end(); occs+=(**(ci++))(example)); 
     128  return occs; 
    127129} 
    128130 
     
    184186  return atoms.size()>0; 
    185187  #undef MAX_LINE_LENGTH 
    186 }       
     188} 
    187189 
    188190 
     
    193195TRuleCondConjunctions::TRuleCondConjunctions() {} 
    194196 
    195 TRuleCondConjunctions::TRuleCondConjunctions(PDomain domain, istream &istr,  
     197TRuleCondConjunctions::TRuleCondConjunctions(PDomain domain, istream &istr, 
    196198                                             const vector<pair<string, vector<int> > > &sets) 
    197199{ while(!istr.eof()) { 
     
    201203  } 
    202204} 
    203      
     205 
    204206 
    205207/*~*************************************************************************************** 
     
    281283 
    282284  return atoms.size()>0; 
    283 }       
     285} 
    284286#undef MAX_LINE_LENGTH 
    285287 
  • source/orange/svm.hpp

    r6481 r6963  
    145145##########################################*/ 
    146146 
    147 #include <iostream> 
    148147#include "classify.hpp" 
    149148#include "learn.hpp" 
  • source/orange/symmatrix.cpp

    r6531 r6963  
    11/* 
    22    This file is part of Orange. 
    3      
     3 
    44    Copyright 1996-2010 Faculty of Computer and Information Science, University of Ljubljana 
    55    Contact: janez.demsar@fri.uni-lj.si 
     
    2222 
    2323int TSymMatrix::getindex(const int &i, const int &j, bool raiseExceptions) const 
    24 {  
     24{ 
    2525  if (i==j) { 
    2626    if ((i>=dim) || (i<0)) 
  • source/orange/symmatrix.hpp

    r6531 r6963  
    11/* 
    22    This file is part of Orange. 
    3      
     3 
    44    Copyright 1996-2010 Faculty of Computer and Information Science, University of Ljubljana 
    55    Contact: janez.demsar@fri.uni-lj.si 
     
    2727#include <stdio.h> 
    2828#include "stdlib.h" 
    29 #include <iostream> 
    3029#include <algorithm> 
    3130 
Note: See TracChangeset for help on using the changeset viewer.