Skip to content

Commit

Permalink
fix go includes
Browse files Browse the repository at this point in the history
  • Loading branch information
@lperron
lperron committed Jan 8, 2024
1 parent 48ccc03 commit 1d546a3
Show file tree
Hide file tree
Showing 28 changed files with 72 additions and 72 deletions.
4 changes: 2 additions & 2 deletions ortools/sat/docs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
)
Expand Down Expand Up @@ -264,7 +264,7 @@ func simpleSatProgram() error {

func main() {
if err := simpleSatProgram(); err != nil {
log.Exitf("simpleSatProgram returned with error: %v", err)
glog.Exitf("simpleSatProgram returned with error: %v", err)
}
}
```
8 changes: 4 additions & 4 deletions ortools/sat/docs/boolean_logic.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public class LiteralSampleSat
package main

import (
"ortools/base/go/log"
"github.com/golang/glog"
"ortools/sat/go/cpmodel"
)

Expand All @@ -123,7 +123,7 @@ func literalSampleSat() {
x := model.NewBoolVar().WithName("x")
notX := x.Not()

log.Infof("x = %d, x.Not() = %d", x.Index(), notX.Index())
glog.Infof("x = %d, x.Not() = %d", x.Index(), notX.Index())
}

func main() {
Expand Down Expand Up @@ -525,7 +525,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
"ortools/sat/go/cpmodel"
sppb "ortools/sat/sat_parameters_go_proto"
Expand Down Expand Up @@ -576,7 +576,7 @@ func booleanProductSample() error {
func main() {
err := booleanProductSample()
if err != nil {
log.Exitf("booleanProductSample returned with error: %v", err)
glog.Exitf("booleanProductSample returned with error: %v", err)
}
}
```
8 changes: 4 additions & 4 deletions ortools/sat/docs/channeling.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
Expand Down Expand Up @@ -364,7 +364,7 @@ func channelingSampleSat() error {

func main() {
if err := channelingSampleSat(); err != nil {
log.Exitf("channelingSampleSat returned with error: %v", err)
glog.Exitf("channelingSampleSat returned with error: %v", err)
}
}
```
Expand Down Expand Up @@ -785,7 +785,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"ortools/sat/go/cpmodel"
)

Expand Down Expand Up @@ -883,7 +883,7 @@ func binpackingProblemSat() error {

func main() {
if err := binpackingProblemSat(); err != nil {
log.Exitf("binpackingProblemSat returned with error: %v", err)
glog.Exitf("binpackingProblemSat returned with error: %v", err)
}
}
```
12 changes: 6 additions & 6 deletions ortools/sat/docs/integer_arithmetic.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
)
Expand Down Expand Up @@ -315,7 +315,7 @@ func rabbitsAndPheasants() error {

func main() {
if err := rabbitsAndPheasants(); err != nil {
log.Exitf("rabbitsAndPheasants returned with error: %v", err)
glog.Exitf("rabbitsAndPheasants returned with error: %v", err)
}
}
```
Expand Down Expand Up @@ -674,7 +674,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
Expand Down Expand Up @@ -741,7 +741,7 @@ func earlinessTardinessCostSampleSat() error {

func main() {
if err := earlinessTardinessCostSampleSat(); err != nil {
log.Exitf("earlinessTardinessCostSampleSat returned with error: %v", err)
glog.Exitf("earlinessTardinessCostSampleSat returned with error: %v", err)
}
}
```
Expand Down Expand Up @@ -1129,7 +1129,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
Expand Down Expand Up @@ -1206,7 +1206,7 @@ func stepFunctionSampleSat() error {

func main() {
if err := stepFunctionSampleSat(); err != nil {
log.Exitf("stepFunctionSampleSat returned with error: %v", err)
glog.Exitf("stepFunctionSampleSat returned with error: %v", err)
}
}
```
4 changes: 2 additions & 2 deletions ortools/sat/docs/model.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
)
Expand Down Expand Up @@ -352,7 +352,7 @@ func solutionHintingSampleSat() error {

func main() {
if err := solutionHintingSampleSat(); err != nil {
log.Exitf("solutionHintingSampleSat returned with error: %v", err)
glog.Exitf("solutionHintingSampleSat returned with error: %v", err)
}
}
```
Expand Down
16 changes: 8 additions & 8 deletions ortools/sat/docs/scheduling.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"ortools/sat/go/cpmodel"
)

Expand Down Expand Up @@ -231,7 +231,7 @@ func intervalSampleSat() error {

func main() {
if err := intervalSampleSat(); err != nil {
log.Exitf("intervalSampleSat returned with error: %v", err)
glog.Exitf("intervalSampleSat returned with error: %v", err)
}
}
```
Expand Down Expand Up @@ -421,7 +421,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"ortools/sat/go/cpmodel"
)

Expand Down Expand Up @@ -454,7 +454,7 @@ func optionalIntervalSampleSat() error {

func main() {
if err := optionalIntervalSampleSat(); err != nil {
log.Exitf("optionalIntervalSampleSat returned with error: %v", err)
glog.Exitf("optionalIntervalSampleSat returned with error: %v", err)
}
}
```
Expand Down Expand Up @@ -753,7 +753,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
)
Expand Down Expand Up @@ -821,7 +821,7 @@ func noOverlapSampleSat() error {

func main() {
if err := noOverlapSampleSat(); err != nil {
log.Exitf("noOverlapSampleSat returned with error: %v", err)
glog.Exitf("noOverlapSampleSat returned with error: %v", err)
}
}
```
Expand Down Expand Up @@ -1647,7 +1647,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
)
Expand Down Expand Up @@ -1790,7 +1790,7 @@ func rankingSampleSat() error {

func main() {
if err := rankingSampleSat(); err != nil {
log.Exitf("rankingSampleSat returned with error: %v", err)
glog.Exitf("rankingSampleSat returned with error: %v", err)
}
}
```
Expand Down
12 changes: 6 additions & 6 deletions ortools/sat/docs/solver.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
Expand Down Expand Up @@ -240,7 +240,7 @@ func solveWithTimeLimitSampleSat() error {

func main() {
if err := solveWithTimeLimitSampleSat(); err != nil {
log.Exitf("solveWithTimeLimitSampleSat returned with error: %v", err)
glog.Exitf("solveWithTimeLimitSampleSat returned with error: %v", err)
}
}
```
Expand Down Expand Up @@ -504,7 +504,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
"ortools/sat/go/cpmodel"
sppb "ortools/sat/sat_parameters_go_proto"
Expand Down Expand Up @@ -552,7 +552,7 @@ func solveAndPrintIntermediateSolutionsSampleSat() error {

func main() {
if err := solveAndPrintIntermediateSolutionsSampleSat(); err != nil {
log.Exitf("solveAndPrintIntermediateSolutionsSampleSat returned with error: %v", err)
glog.Exitf("solveAndPrintIntermediateSolutionsSampleSat returned with error: %v", err)
}
}
```
Expand Down Expand Up @@ -840,7 +840,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
"ortools/sat/go/cpmodel"
sppb "ortools/sat/sat_parameters_go_proto"
Expand Down Expand Up @@ -885,7 +885,7 @@ func searchForAllSolutionsSampleSat() error {

func main() {
if err := searchForAllSolutionsSampleSat(); err != nil {
log.Exitf("searchForAllSolutionsSampleSat returned with error: %v", err)
glog.Exitf("searchForAllSolutionsSampleSat returned with error: %v", err)
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion ortools/sat/go/cp_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"math"
"sort"

"ortools/base/go/log"
"github.com/golang/glog"

cmpb "ortools/sat/cp_model_go_proto"
)
Expand Down
2 changes: 1 addition & 1 deletion ortools/sat/go/cp_model_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"sort"
"testing"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/cmp/cmp"
"golang/protobuf/v2/testing/protocmp/protocmp"
cmpb "ortools/sat/cp_model_go_proto"
Expand Down
4 changes: 2 additions & 2 deletions ortools/sat/samples/assumptions_sample_sat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
)
Expand Down Expand Up @@ -62,6 +62,6 @@ func assumptionsSampleSat() error {

func main() {
if err := assumptionsSampleSat(); err != nil {
log.Exitf("assumptionsSampleSat returned with error: %v", err)
glog.Exitf("assumptionsSampleSat returned with error: %v", err)
}
}
4 changes: 2 additions & 2 deletions ortools/sat/samples/binpacking_problem_sat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"ortools/sat/go/cpmodel"
)

Expand Down Expand Up @@ -116,6 +116,6 @@ func binpackingProblemSat() error {

func main() {
if err := binpackingProblemSat(); err != nil {
log.Exitf("binpackingProblemSat returned with error: %v", err)
glog.Exitf("binpackingProblemSat returned with error: %v", err)
}
}
4 changes: 2 additions & 2 deletions ortools/sat/samples/boolean_product_sample_sat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
"ortools/sat/go/cpmodel"
sppb "ortools/sat/sat_parameters_go_proto"
Expand Down Expand Up @@ -68,6 +68,6 @@ func booleanProductSample() error {
func main() {
err := booleanProductSample()
if err != nil {
log.Exitf("booleanProductSample returned with error: %v", err)
glog.Exitf("booleanProductSample returned with error: %v", err)
}
}
4 changes: 2 additions & 2 deletions ortools/sat/samples/channeling_sample_sat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
Expand Down Expand Up @@ -76,6 +76,6 @@ func channelingSampleSat() error {

func main() {
if err := channelingSampleSat(); err != nil {
log.Exitf("channelingSampleSat returned with error: %v", err)
glog.Exitf("channelingSampleSat returned with error: %v", err)
}
}
4 changes: 2 additions & 2 deletions ortools/sat/samples/earliness_tardiness_cost_sample_sat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package main
import (
"fmt"

"ortools/base/go/log"
"github.com/golang/glog"
"golang/protobuf/v2/proto/proto"
cmpb "ortools/sat/cp_model_go_proto"
"ortools/sat/go/cpmodel"
Expand Down Expand Up @@ -85,6 +85,6 @@ func earlinessTardinessCostSampleSat() error {

func main() {
if err := earlinessTardinessCostSampleSat(); err != nil {
log.Exitf("earlinessTardinessCostSampleSat returned with error: %v", err)
glog.Exitf("earlinessTardinessCostSampleSat returned with error: %v", err)
}
}
Loading

0 comments on commit 1d546a3

Please sign in to comment.