Skip to content

Commit af75994

Browse files
authored
Merge branch 'master' into od/ci
2 parents 5281a7b + 3852adc commit af75994

File tree

5 files changed

+23
-3
lines changed

5 files changed

+23
-3
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 Thibaut Cuvelier
3+
Copyright (c) 2021 Thibaut Cuvelier and contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

src/Chuffed.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright (c) 2021 Thibaut Cuvelier and contributors
2+
#
3+
# Use of this source code is governed by an MIT-style license that can be found
4+
# in the LICENSE.md file or at https://opensource.org/licenses/MIT.
5+
16
module Chuffed
27

38
import ConstraintProgrammingExtensions

test/MOI.jl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
# Copyright (c) 2021 Thibaut Cuvelier and contributors
2+
#
3+
# Use of this source code is governed by an MIT-style license that can be found
4+
# in the LICENSE.md file or at https://opensource.org/licenses/MIT.
5+
16
@testset "MOI interface" begin
27
@testset "basic.fzn" begin
38
model = optimizer(Int)
4-
9+
510
@test MOI.supports_add_constrained_variable(model, MOI.Integer)
611
@test MOI.supports_constraint(CP.FlatZinc.Model(), MOI.ScalarAffineFunction{Int}, MOI.LessThan{Int})
712

@@ -25,7 +30,7 @@
2530

2631
@testset "Infeasible" begin
2732
model = optimizer(Int)
28-
33+
2934
@test MOI.supports_add_constrained_variable(model, MOI.Integer)
3035
@test MOI.supports_constraint(CP.FlatZinc.Model(), MOI.ScalarAffineFunction{Int}, MOI.LessThan{Int})
3136

test/chuffed.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright (c) 2021 Thibaut Cuvelier and contributors
2+
#
3+
# Use of this source code is governed by an MIT-style license that can be found
4+
# in the LICENSE.md file or at https://opensource.org/licenses/MIT.
5+
16
normalize(x) = replace(x, "\r\n" => "\n")
27

38
# TODO: move the samples to CP?? Not all solvers will understand all FZN files :/.

test/runtests.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright (c) 2021 Thibaut Cuvelier and contributors
2+
#
3+
# Use of this source code is governed by an MIT-style license that can be found
4+
# in the LICENSE.md file or at https://opensource.org/licenses/MIT.
5+
16
using Chuffed
27
using MathOptInterface
38
using ConstraintProgrammingExtensions

0 commit comments

Comments
 (0)