Changeset 1304


Ignore:
Timestamp:
Jan 29, 2020 12:09:32 PM (2 months ago)
Author:
stefan
Message:

rename Nauty files to CouenneNauty?

  • Nauty.h created conflicts with nauty's nauty.h on strange filesystems
  • change from .h to .hpp for consistency
  • rename also Nauty.cpp for consistency
Location:
branches/autotools-update/Couenne/src
Files:
12 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Couenne/src/Makefile.am

    r1294 r1304  
    172172
    173173if COIN_HAS_NAUTY
    174 includecoin_HEADERS += branch/Nauty.h
     174includecoin_HEADERS += branch/CouenneNauty.hpp
    175175endif
    176176
  • branches/autotools-update/Couenne/src/Makefile.in

    r1294 r1304  
    105105# cut/sdpcuts/rlt_cuts.hpp
    106106# ellipcuts/CouenneEllipCuts.hpp
    107 @COIN_HAS_NAUTY_TRUE@am__append_1 = branch/Nauty.h
     107@COIN_HAS_NAUTY_TRUE@am__append_1 = branch/CouenneNauty.hpp
    108108subdir = src
    109109ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    270270        cut/sdpcuts/CouenneSdpCuts.hpp cut/sdpcuts/CouennePSDcon.hpp \
    271271        cut/sdpcuts/CouenneMatrix.hpp \
    272         cut/crossconv/CouenneCrossConv.hpp branch/Nauty.h
     272        cut/crossconv/CouenneCrossConv.hpp branch/CouenneNauty.hpp
    273273HEADERS = $(includecoin_HEADERS)
    274274am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
  • branches/autotools-update/Couenne/src/branch/CouenneChooseStrong.cpp

    r1293 r1304  
    3737
    3838#ifdef COIN_HAS_NAUTY
    39 #include "Nauty.h"
     39#include "CouenneNauty.hpp"
    4040#endif
    4141
  • branches/autotools-update/Couenne/src/branch/CouenneChooseVariable.cpp

    r1293 r1304  
    2222
    2323#ifdef COIN_HAS_NAUTY
    24 #include "Nauty.h"
     24#include "CouenneNauty.hpp"
    2525#endif
    2626
  • branches/autotools-update/Couenne/src/branch/CouenneNauty.cpp

    r1303 r1304  
    11/* $Id$
    22 *
    3  * Name:    Nauty.cpp
     3 * Name:    CouenneNauty.cpp
    44 * Authors: Jim Ostrowski
    55 * Purpose: Branching with symmetry -- implementation of the Nauty object
     
    1111#include <cassert>
    1212#include <cmath>
    13 #include "Nauty.h"
     13#include "CouenneNauty.hpp"
    1414#include <iostream>
    1515#include <algorithm>
  • branches/autotools-update/Couenne/src/branch/CouenneNauty.hpp

    r1303 r1304  
    11/* $Id$
    22 *
    3  * Name:    Nauty.cpp
     3 * Name:    CouenneNauty.hpp
    44 * Authors: Jim Ostrowski
    55 * Purpose: Branching with symmetry
     
    99 */
    1010
    11 #ifndef NAUTY_H
    12 #define NAUTY_H
     11#ifndef COUENNENAUTY_HPP
     12#define COUENNENAUTY_HPP
    1313
    1414#include "CouenneConfig.h"
  • branches/autotools-update/Couenne/src/branch/CouenneOrbitObj.hpp

    r560 r1304  
    1818#include "OsiBranchingObject.hpp"
    1919#include "CouenneObject.hpp"
    20 #include "Nauty.h"
     20#include "CouenneNauty.hpp"
    2121
    2222namespace Couenne {
  • branches/autotools-update/Couenne/src/branch/Makefile.am

    r1294 r1304  
    3131
    3232if COIN_HAS_NAUTY
    33 libCouenneBranch_la_SOURCES += Nauty.cpp
     33libCouenneBranch_la_SOURCES += CouenneNauty.cpp
    3434endif
    3535
  • branches/autotools-update/Couenne/src/branch/Makefile.in

    r1294 r1304  
    9595build_triplet = @build@
    9696host_triplet = @host@
    97 @COIN_HAS_NAUTY_TRUE@am__append_1 = Nauty.cpp
     97@COIN_HAS_NAUTY_TRUE@am__append_1 = CouenneNauty.cpp
    9898subdir = src/branch
    9999ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    109109LTLIBRARIES = $(noinst_LTLIBRARIES)
    110110libCouenneBranch_la_LIBADD =
    111 @COIN_HAS_NAUTY_TRUE@am__objects_1 = Nauty.lo
     111@COIN_HAS_NAUTY_TRUE@am__objects_1 = CouenneNauty.lo
    112112am_libCouenneBranch_la_OBJECTS = CouenneThreeWayBranchObj.lo \
    113113        CouenneBranchingObject.lo CouenneObject.lo CouenneVarObject.lo \
     
    144144        ./$(DEPDIR)/CouenneComplBranchingObject.Plo \
    145145        ./$(DEPDIR)/CouenneComplObject.Plo \
    146         ./$(DEPDIR)/CouenneObject.Plo \
     146        ./$(DEPDIR)/CouenneNauty.Plo ./$(DEPDIR)/CouenneObject.Plo \
    147147        ./$(DEPDIR)/CouenneOrbitBranchingObj.Plo \
    148148        ./$(DEPDIR)/CouenneOrbitObj.Plo \
    149149        ./$(DEPDIR)/CouenneSOSObject.Plo \
    150150        ./$(DEPDIR)/CouenneThreeWayBranchObj.Plo \
    151         ./$(DEPDIR)/CouenneVarObject.Plo ./$(DEPDIR)/Nauty.Plo \
     151        ./$(DEPDIR)/CouenneVarObject.Plo \
    152152        ./$(DEPDIR)/StrongBranchingSetupList.Plo \
    153153        ./$(DEPDIR)/doStrongBranching.Plo \
     
    434434@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CouenneComplBranchingObject.Plo@am__quote@ # am--include-marker
    435435@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CouenneComplObject.Plo@am__quote@ # am--include-marker
     436@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CouenneNauty.Plo@am__quote@ # am--include-marker
    436437@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CouenneObject.Plo@am__quote@ # am--include-marker
    437438@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CouenneOrbitBranchingObj.Plo@am__quote@ # am--include-marker
     
    440441@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CouenneThreeWayBranchObj.Plo@am__quote@ # am--include-marker
    441442@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CouenneVarObject.Plo@am__quote@ # am--include-marker
    442 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nauty.Plo@am__quote@ # am--include-marker
    443443@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrongBranchingSetupList.Plo@am__quote@ # am--include-marker
    444444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/doStrongBranching.Plo@am__quote@ # am--include-marker
     
    578578        -rm -f ./$(DEPDIR)/CouenneComplBranchingObject.Plo
    579579        -rm -f ./$(DEPDIR)/CouenneComplObject.Plo
     580        -rm -f ./$(DEPDIR)/CouenneNauty.Plo
    580581        -rm -f ./$(DEPDIR)/CouenneObject.Plo
    581582        -rm -f ./$(DEPDIR)/CouenneOrbitBranchingObj.Plo
     
    584585        -rm -f ./$(DEPDIR)/CouenneThreeWayBranchObj.Plo
    585586        -rm -f ./$(DEPDIR)/CouenneVarObject.Plo
    586         -rm -f ./$(DEPDIR)/Nauty.Plo
    587587        -rm -f ./$(DEPDIR)/StrongBranchingSetupList.Plo
    588588        -rm -f ./$(DEPDIR)/doStrongBranching.Plo
     
    642642        -rm -f ./$(DEPDIR)/CouenneComplBranchingObject.Plo
    643643        -rm -f ./$(DEPDIR)/CouenneComplObject.Plo
     644        -rm -f ./$(DEPDIR)/CouenneNauty.Plo
    644645        -rm -f ./$(DEPDIR)/CouenneObject.Plo
    645646        -rm -f ./$(DEPDIR)/CouenneOrbitBranchingObj.Plo
     
    648649        -rm -f ./$(DEPDIR)/CouenneThreeWayBranchObj.Plo
    649650        -rm -f ./$(DEPDIR)/CouenneVarObject.Plo
    650         -rm -f ./$(DEPDIR)/Nauty.Plo
    651651        -rm -f ./$(DEPDIR)/StrongBranchingSetupList.Plo
    652652        -rm -f ./$(DEPDIR)/doStrongBranching.Plo
  • branches/autotools-update/Couenne/src/branch/StrongBranchingSetupList.cpp

    r1293 r1304  
    3232
    3333#ifdef COIN_HAS_NAUTY
    34 #include "Nauty.h"
     34#include "CouenneNauty.hpp"
    3535#endif
    3636
  • branches/autotools-update/Couenne/src/convex/generateCuts.cpp

    r1293 r1304  
    2424
    2525#ifdef COIN_HAS_NAUTY
    26 #include "Nauty.h"
     26#include "CouenneNauty.hpp"
    2727#endif
    2828
  • branches/autotools-update/Couenne/src/main/BonCouenne.cpp

    r1302 r1304  
    4747
    4848#ifdef COIN_HAS_NAUTY
    49 #include "Nauty.h"
     49#include "CouenneNauty.hpp"
    5050#include "CouenneBranchingObject.hpp"
    5151#endif
  • branches/autotools-update/Couenne/src/problem/CouenneProblemConstructors.cpp

    r1293 r1304  
    3939
    4040#ifdef COIN_HAS_NAUTY
    41 #include "Nauty.h"
     41#include "CouenneNauty.hpp"
    4242#endif
    4343
  • branches/autotools-update/Couenne/src/problem/CouenneSymmetry.cpp

    r1296 r1304  
    2727#include "CouenneExprGroup.hpp"
    2828
    29 #include "Nauty.h"
     29#include "CouenneNauty.hpp"
    3030#include "CouenneBranchingObject.hpp"
    3131
Note: See TracChangeset for help on using the changeset viewer.