Skip to content

Commit

Permalink
Merge pull request #374 from coin-or/refactor
Browse files Browse the repository at this point in the history
Refactor Cbc
  • Loading branch information
tkralphs committed Jan 2, 2022
2 parents 4b9a4f2 + fe0a657 commit b9d0663
Show file tree
Hide file tree
Showing 77 changed files with 44,481 additions and 16,417 deletions.
8 changes: 4 additions & 4 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: MultiLine
AlwaysBreakTemplateDeclarations: false
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
Expand All @@ -39,7 +39,7 @@ BraceWrapping:
BreakBeforeBinaryOperators: All
BreakBeforeBraces: WebKit
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
#BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeComma
Expand Down Expand Up @@ -85,7 +85,7 @@ PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
#PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Right
Expand All @@ -97,7 +97,7 @@ SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
#SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ jobs:
{ os: windows-2019, arch: x86_64, msystem: mingw64, debug: false, suffix: "" },
{ os: windows-2019, arch: i686, msystem: mingw32, debug: true, suffix: "-dbg" },
{ os: windows-2019, arch: i686, msystem: mingw32, debug: false, suffix: "" },
{ os: windows-2019, arch: msvc, msystem: mingw64, debug: true, suffix: "-mdd" },
{ os: windows-2019, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
{ os: windows-2016, arch: msvc, msystem: mingw64, debug: true, suffix: "-mdd" },
{ os: windows-2016, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
{ os: windows-2022, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
]
steps:
- name: Checkout source
Expand Down
61 changes: 0 additions & 61 deletions CbcSourceFilesTable.csv

This file was deleted.

Binary file removed CbcSourceFilesTable.xls
Binary file not shown.
103 changes: 0 additions & 103 deletions CbcSourceFilesTable2.csv

This file was deleted.

Binary file removed CbcSourceFilesTable2.xls
Binary file not shown.
Loading

0 comments on commit b9d0663

Please sign in to comment.