diff --git a/go.mod b/go.mod index e559ae9f54..326b311852 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,6 @@ require ( github.com/golang/mock v1.4.1 github.com/google/go-cmp v0.5.6 github.com/googleapis/gnostic v0.5.5 - github.com/irifrance/gini v1.0.1 github.com/itchyny/gojq v0.11.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2 github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37 @@ -26,6 +25,7 @@ require ( github.com/openshift/api v0.0.0-20200331152225-585af27e34fd github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 github.com/operator-framework/api v0.10.3 + github.com/operator-framework/gini v1.1.0 github.com/operator-framework/operator-registry v1.17.5 github.com/otiai10/copy v1.2.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index a6ef80bb07..d862aed784 100644 --- a/go.sum +++ b/go.sum @@ -631,8 +631,6 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/irifrance/gini v1.0.1 h1:oTABiARLoRsnTmda0uY2u2e5kfm8e6meBZB19lf5xhE= -github.com/irifrance/gini v1.0.1/go.mod h1:swH5OTtiG/X/YrU06r288qZwq6I1agpbuXQOB55xqGU= github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645 h1:3gyXljUyTWWTv/NMFPvwgxJSdE9Mamg2r3x8HMBl+Uo= github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645/go.mod h1:296z3W7Xsrp2mlIY88ruDKscuvrkL6zXCNRtaYVshzw= github.com/itchyny/go-flags v1.5.0/go.mod h1:lenkYuCobuxLBAd/HGFE4LRoW8D3B6iXRQfWYJ+MNbA= @@ -880,6 +878,8 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/operator-framework/api v0.7.1/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY= github.com/operator-framework/api v0.10.3 h1:C4DE7Rr3+ztUw3mKiFyfAiUJSVOty/cJmpwE90/kYro= github.com/operator-framework/api v0.10.3/go.mod h1:tV0BUNvly7szq28ZPBXhjp1Sqg5yHCOeX19ui9K4vjI= +github.com/operator-framework/gini v1.1.0 h1:w84bE/pi0nlnIRAxzYguoYAnL9s5T6RSVZKYWcxO3yI= +github.com/operator-framework/gini v1.1.0/go.mod h1:L4GlF3xPPfQUoWglKhaBcR8/LZn3fWtMB1mwUyOGv98= github.com/operator-framework/operator-registry v1.17.5 h1:LR8m1rFz5Gcyje8WK6iYt+gIhtzqo52zMRALdmTYHT0= github.com/operator-framework/operator-registry v1.17.5/go.mod h1:sRQIgDMZZdUcmHltzyCnM6RUoDF+WS8Arj1BQIARDS8= github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= diff --git a/pkg/controller/registry/resolver/solver/constraints.go b/pkg/controller/registry/resolver/solver/constraints.go index 84ecb2fc1a..ca3c4f5331 100644 --- a/pkg/controller/registry/resolver/solver/constraints.go +++ b/pkg/controller/registry/resolver/solver/constraints.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/irifrance/gini/logic" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/logic" + "github.com/operator-framework/gini/z" ) // Constraint implementations limit the circumstances under which a diff --git a/pkg/controller/registry/resolver/solver/lit_mapping.go b/pkg/controller/registry/resolver/solver/lit_mapping.go index 39220fd52e..f837ffc3e8 100644 --- a/pkg/controller/registry/resolver/solver/lit_mapping.go +++ b/pkg/controller/registry/resolver/solver/lit_mapping.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/irifrance/gini/inter" - "github.com/irifrance/gini/logic" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/inter" + "github.com/operator-framework/gini/logic" + "github.com/operator-framework/gini/z" ) type DuplicateIdentifier Identifier diff --git a/pkg/controller/registry/resolver/solver/search.go b/pkg/controller/registry/resolver/solver/search.go index 4344b444ed..f36678f1ee 100644 --- a/pkg/controller/registry/resolver/solver/search.go +++ b/pkg/controller/registry/resolver/solver/search.go @@ -3,8 +3,8 @@ package solver import ( "context" - "github.com/irifrance/gini/inter" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/inter" + "github.com/operator-framework/gini/z" ) type choice struct { diff --git a/pkg/controller/registry/resolver/solver/search_test.go b/pkg/controller/registry/resolver/solver/search_test.go index a57443a207..53dff9c748 100644 --- a/pkg/controller/registry/resolver/solver/search_test.go +++ b/pkg/controller/registry/resolver/solver/search_test.go @@ -1,4 +1,4 @@ -//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o zz_search_test.go ../../../../../vendor/github.com/irifrance/gini/inter S +//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o zz_search_test.go ../../../../../vendor/github.com/operator-framework/gini/inter S package solver @@ -6,8 +6,8 @@ import ( "context" "testing" - "github.com/irifrance/gini/inter" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/inter" + "github.com/operator-framework/gini/z" "github.com/stretchr/testify/assert" ) diff --git a/pkg/controller/registry/resolver/solver/solve.go b/pkg/controller/registry/resolver/solver/solve.go index 8f559569d7..712ae3bcc7 100644 --- a/pkg/controller/registry/resolver/solver/solve.go +++ b/pkg/controller/registry/resolver/solver/solve.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/irifrance/gini" - "github.com/irifrance/gini/inter" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini" + "github.com/operator-framework/gini/inter" + "github.com/operator-framework/gini/z" ) var Incomplete = errors.New("cancelled before a solution could be found") diff --git a/pkg/controller/registry/resolver/solver/zz_search_test.go b/pkg/controller/registry/resolver/solver/zz_search_test.go index 4b0a96701c..5ef7eed2c6 100644 --- a/pkg/controller/registry/resolver/solver/zz_search_test.go +++ b/pkg/controller/registry/resolver/solver/zz_search_test.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/irifrance/gini/inter" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/inter" + "github.com/operator-framework/gini/z" ) type FakeS struct { diff --git a/vendor/github.com/irifrance/gini/go.mod b/vendor/github.com/irifrance/gini/go.mod deleted file mode 100644 index cb2fe6da4d..0000000000 --- a/vendor/github.com/irifrance/gini/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/irifrance/gini diff --git a/vendor/github.com/irifrance/gini/.travis.yml b/vendor/github.com/operator-framework/gini/.travis.yml similarity index 100% rename from vendor/github.com/irifrance/gini/.travis.yml rename to vendor/github.com/operator-framework/gini/.travis.yml diff --git a/vendor/github.com/irifrance/gini/LICENSE b/vendor/github.com/operator-framework/gini/LICENSE similarity index 100% rename from vendor/github.com/irifrance/gini/LICENSE rename to vendor/github.com/operator-framework/gini/LICENSE diff --git a/vendor/github.com/irifrance/gini/README.md b/vendor/github.com/operator-framework/gini/README.md similarity index 94% rename from vendor/github.com/irifrance/gini/README.md rename to vendor/github.com/operator-framework/gini/README.md index ea1e025912..42d6ff2fb1 100644 --- a/vendor/github.com/irifrance/gini/README.md +++ b/vendor/github.com/operator-framework/gini/README.md @@ -9,7 +9,7 @@ the first ever performant pure-Go SAT solver made available. This solver is fully open source, originally developped at IRI France. -# Build/Install +## Build/Install For the impatient: @@ -22,7 +22,7 @@ safety threat to client code. This makes a signficant speed difference (maybe 1 problems. -# The SAT Problem +## The SAT Problem The SAT problem is perhaps the most famous NP-complete problem. As such, SAT solvers can be used to try to solve hard problems, such as travelling salesman @@ -40,7 +40,8 @@ useful. Readers interested in more depth should consult Wikipedia, or The Handbook of Satisfiability, or Donald Knuth's latest volume of The Art of Computer Programming. -## CNF +### CNF + A CNF is a conjunction of clauses c1 and c2 and ... and cM @@ -73,15 +74,16 @@ which expresses a set of clauses whose satisfying assignments are or {-1,-2,-3,-4} -## Models +### Models + A model of a CNF is a value for each of the variables which makes every clause in the CNF true. The SAT problem is determining whether or not a model exists for a given set of clauses. -## Proofs +### Proofs -### Resolution +#### Resolution Resolution is a form of logical reasoning with conjunctions of clauses. Given 2 clauses of the form @@ -114,7 +116,8 @@ even hard problems become tractable. With up to several tens of millions of resolutions happening per second on one modern single core CPU, even problems with known exponential bounds on resolution steps can be solved. -# Solving Formulas and Circuits +## Solving Formulas and Circuits + Gini provides a simple and efficient logic modelling library which supports easy construction of arbitrary Boolean formulas. The library uses and-inverter graphs, structural hashing, constant propagation and can be used for @@ -141,12 +144,14 @@ also contains lots of purely Boolean logic (implicitly or not). Most SAT use cases use a front end for modelling arbitrary formulas. When formats are needed for interchange, Gini supports the following. -## Aiger +### Aiger + Gini supports [aiger version 1.9](http://fmv.jku.at/aiger/) in conjunction with its logic library. The logic.C and logic.S circuit types can be stored, exchanged, read and written in aiger ascii and binary formats. -## Dimacs +### Dimacs + CNF Dimacs files, which are an ancient widely used format for representing CNF formulas. Dimacs files are usually used for benchmarking solvers, to eliminate the formula representation layer. The fact that the format is more or less @@ -155,7 +160,8 @@ format, even though there is I/O, CNF translation, and parsing overhead by comparison to using a logic library. -# Optimisation +## Optimisation + With Cardinality constraints, optimisation is easy import "github.com/irifrance/gini" @@ -193,7 +199,8 @@ With Cardinality constraints, optimisation is easy // use the model, if one was found, from s to propose a build -# Activation Literals +## Activation Literals + Gini supports recycling activation literals with the [Activatable interface](http://godoc.org/github.com/irifrance/gini/inter#Activatable) @@ -206,7 +213,8 @@ and constructing the clauses on the fly. Activations work underneath test scope assumptions, making the interface for Gini perhaps the most flexible available. -# Performance +## Performance + In applications, SAT problems normally have an exponential tail runtime distribution with a strong bias towards bigger problems populating the longer runtime part of the distribution. So in practice, a good rule of thumb is 1 in @@ -239,7 +247,8 @@ but we are confident Gini's core solver is a well positioned alternative to stan high-performance CDCL solvers in C/C++. We encourage you to give it a try and welcome any comparisons. -## Benchmarking +### Benchmarking + To that end, gini comes with a nifty SAT solver benchmarking tool which allows to easily select benchmarks into a "bench" format, which is just a particular structure of directories and files. The tool can then also run solvers @@ -254,21 +263,24 @@ software (SMT, CPLEX, etc) where runtimes vary and are unpredictable and potentially high. If you do so, please follow the license or ask for alternatives. -# Concurrency +## Concurrency + Gini is written in Go and uses several goroutines by default for garbage collection and system call scheduling. There is a "core" single-goroutine solver, xo, which is in an internal package for gutsy low level SAT hackers. -## Connections to solving processes +### Connections to solving processes + Gini provides safe connections to solving processes which are guaranteed to not lose any solution found, can pause and resume, run with a timeout, test without solving, etc. -## Solve-time copyable solvers. +### Solve-time copyable solvers. + Gini provides copyable solvers, which can be safely copied *at solvetime during a pause*. -## Ax +### Ax Gini provides an "Assumption eXchange" package for deploying solves under different sets of assumptions to the same set of underlying constraints in parallel. This can give linear speed up in tasks, such as PDR/IC3, which @@ -277,7 +289,7 @@ generate lots of assumptions. We hope to extend this with clause sharing soon, which would give superlinear speedup according to the literature. -# Distributed and CRISP +## Distributed and CRISP Gini provides a definition and reference implementation for [CRISP-1.0](https://github.com/irifrance/gini/blob/master/doc/crisp/crisp.pdf), @@ -308,3 +320,20 @@ a CRISP-1.0 client and server. A command, crispd, is supplied for the CRISP server. +## Citing Gini + +Zenodo DOI based citations and download: +[![DOI](https://zenodo.org/badge/64034957.svg)](https://zenodo.org/badge/latestdoi/64034957) + +BibText: +``` +@misc{scott_cotton_2019_2553490, + author = {Scott Cotton}, + title = {irifrance/gini: Sapeur}, + month = jan, + year = 2019, + doi = {10.5281/zenodo.2553490}, + url = {https://doi.org/10.5281/zenodo.2553490} +} +``` + diff --git a/vendor/github.com/irifrance/gini/dimacs/cfilt.go b/vendor/github.com/operator-framework/gini/dimacs/cfilt.go similarity index 100% rename from vendor/github.com/irifrance/gini/dimacs/cfilt.go rename to vendor/github.com/operator-framework/gini/dimacs/cfilt.go diff --git a/vendor/github.com/irifrance/gini/dimacs/cnf.go b/vendor/github.com/operator-framework/gini/dimacs/cnf.go similarity index 98% rename from vendor/github.com/irifrance/gini/dimacs/cnf.go rename to vendor/github.com/operator-framework/gini/dimacs/cnf.go index ef85dda700..c00451f51d 100644 --- a/vendor/github.com/irifrance/gini/dimacs/cnf.go +++ b/vendor/github.com/operator-framework/gini/dimacs/cnf.go @@ -6,8 +6,9 @@ package dimacs import ( "bufio" "fmt" - "github.com/irifrance/gini/z" "io" + + "github.com/operator-framework/gini/z" ) // Type Reader holds info for reading dimacs formatted intput. diff --git a/vendor/github.com/irifrance/gini/dimacs/doc.go b/vendor/github.com/operator-framework/gini/dimacs/doc.go similarity index 100% rename from vendor/github.com/irifrance/gini/dimacs/doc.go rename to vendor/github.com/operator-framework/gini/dimacs/doc.go diff --git a/vendor/github.com/irifrance/gini/dimacs/icnf.go b/vendor/github.com/operator-framework/gini/dimacs/icnf.go similarity index 96% rename from vendor/github.com/irifrance/gini/dimacs/icnf.go rename to vendor/github.com/operator-framework/gini/dimacs/icnf.go index b58ccc66fe..567762a1e9 100644 --- a/vendor/github.com/irifrance/gini/dimacs/icnf.go +++ b/vendor/github.com/operator-framework/gini/dimacs/icnf.go @@ -6,8 +6,9 @@ package dimacs import ( "bufio" "fmt" - "github.com/irifrance/gini/z" "io" + + "github.com/operator-framework/gini/z" ) type iCnfReader struct { diff --git a/vendor/github.com/irifrance/gini/dimacs/int.go b/vendor/github.com/operator-framework/gini/dimacs/int.go similarity index 100% rename from vendor/github.com/irifrance/gini/dimacs/int.go rename to vendor/github.com/operator-framework/gini/dimacs/int.go diff --git a/vendor/github.com/irifrance/gini/dimacs/lit.go b/vendor/github.com/operator-framework/gini/dimacs/lit.go similarity index 88% rename from vendor/github.com/irifrance/gini/dimacs/lit.go rename to vendor/github.com/operator-framework/gini/dimacs/lit.go index 2c4c41c1ab..9ed081687f 100644 --- a/vendor/github.com/irifrance/gini/dimacs/lit.go +++ b/vendor/github.com/operator-framework/gini/dimacs/lit.go @@ -5,7 +5,8 @@ package dimacs import ( "bufio" - "github.com/irifrance/gini/z" + + "github.com/operator-framework/gini/z" ) func readLit(r *bufio.Reader) (m z.Lit, e error) { diff --git a/vendor/github.com/irifrance/gini/dimacs/solve.go b/vendor/github.com/operator-framework/gini/dimacs/solve.go similarity index 100% rename from vendor/github.com/irifrance/gini/dimacs/solve.go rename to vendor/github.com/operator-framework/gini/dimacs/solve.go diff --git a/vendor/github.com/irifrance/gini/dimacs/vis.go b/vendor/github.com/operator-framework/gini/dimacs/vis.go similarity index 96% rename from vendor/github.com/irifrance/gini/dimacs/vis.go rename to vendor/github.com/operator-framework/gini/dimacs/vis.go index e0a5b4dff3..9934b37032 100644 --- a/vendor/github.com/irifrance/gini/dimacs/vis.go +++ b/vendor/github.com/operator-framework/gini/dimacs/vis.go @@ -3,7 +3,7 @@ package dimacs -import "github.com/irifrance/gini/z" +import "github.com/operator-framework/gini/z" // Type Vis provides a visitor interface to reading dimacs files. // diff --git a/vendor/github.com/irifrance/gini/doc.go b/vendor/github.com/operator-framework/gini/doc.go similarity index 100% rename from vendor/github.com/irifrance/gini/doc.go rename to vendor/github.com/operator-framework/gini/doc.go diff --git a/vendor/github.com/irifrance/gini/gini.go b/vendor/github.com/operator-framework/gini/gini.go similarity index 97% rename from vendor/github.com/irifrance/gini/gini.go rename to vendor/github.com/operator-framework/gini/gini.go index 30a254c48c..52a6d4d054 100644 --- a/vendor/github.com/irifrance/gini/gini.go +++ b/vendor/github.com/operator-framework/gini/gini.go @@ -7,10 +7,10 @@ import ( "io" "time" - "github.com/irifrance/gini/dimacs" - "github.com/irifrance/gini/inter" - "github.com/irifrance/gini/internal/xo" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/dimacs" + "github.com/operator-framework/gini/inter" + "github.com/operator-framework/gini/internal/xo" + "github.com/operator-framework/gini/z" ) // Gini is a concrete implementation of solver diff --git a/vendor/github.com/operator-framework/gini/go.mod b/vendor/github.com/operator-framework/gini/go.mod new file mode 100644 index 0000000000..15f34b3a9f --- /dev/null +++ b/vendor/github.com/operator-framework/gini/go.mod @@ -0,0 +1 @@ +module github.com/operator-framework/gini diff --git a/vendor/github.com/irifrance/gini/go.sum b/vendor/github.com/operator-framework/gini/go.sum similarity index 100% rename from vendor/github.com/irifrance/gini/go.sum rename to vendor/github.com/operator-framework/gini/go.sum diff --git a/vendor/github.com/irifrance/gini/inter/doc.go b/vendor/github.com/operator-framework/gini/inter/doc.go similarity index 100% rename from vendor/github.com/irifrance/gini/inter/doc.go rename to vendor/github.com/operator-framework/gini/inter/doc.go diff --git a/vendor/github.com/irifrance/gini/inter/s.go b/vendor/github.com/operator-framework/gini/inter/s.go similarity index 99% rename from vendor/github.com/irifrance/gini/inter/s.go rename to vendor/github.com/operator-framework/gini/inter/s.go index 7cd5f99f14..835a93375c 100644 --- a/vendor/github.com/irifrance/gini/inter/s.go +++ b/vendor/github.com/operator-framework/gini/inter/s.go @@ -6,7 +6,7 @@ package inter import ( "time" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) // Interface Solveable encapsulates a decision diff --git a/vendor/github.com/irifrance/gini/inter/solve.go b/vendor/github.com/operator-framework/gini/inter/solve.go similarity index 100% rename from vendor/github.com/irifrance/gini/inter/solve.go rename to vendor/github.com/operator-framework/gini/inter/solve.go diff --git a/vendor/github.com/irifrance/gini/internal/xo/active.go b/vendor/github.com/operator-framework/gini/internal/xo/active.go similarity index 98% rename from vendor/github.com/irifrance/gini/internal/xo/active.go rename to vendor/github.com/operator-framework/gini/internal/xo/active.go index 2c991abf9b..786f76204f 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/active.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/active.go @@ -1,7 +1,7 @@ package xo import ( - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) type Active struct { diff --git a/vendor/github.com/irifrance/gini/internal/xo/cdat.go b/vendor/github.com/operator-framework/gini/internal/xo/cdat.go similarity index 99% rename from vendor/github.com/irifrance/gini/internal/xo/cdat.go rename to vendor/github.com/operator-framework/gini/internal/xo/cdat.go index 5bb2b8d8b1..41b8367f0c 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/cdat.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/cdat.go @@ -9,7 +9,7 @@ import ( "io" "math" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) // Type CDat: basic operations for storing all the literals (and Chds) in a CNF diff --git a/vendor/github.com/irifrance/gini/internal/xo/cdb.go b/vendor/github.com/operator-framework/gini/internal/xo/cdb.go similarity index 99% rename from vendor/github.com/irifrance/gini/internal/xo/cdb.go rename to vendor/github.com/operator-framework/gini/internal/xo/cdb.go index 5853e9d758..d4615220b9 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/cdb.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/cdb.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) // Type Cdb is the main interface to clauses. diff --git a/vendor/github.com/irifrance/gini/internal/xo/cgc.go b/vendor/github.com/operator-framework/gini/internal/xo/cgc.go similarity index 99% rename from vendor/github.com/irifrance/gini/internal/xo/cgc.go rename to vendor/github.com/operator-framework/gini/internal/xo/cgc.go index 2f605660bd..94cc04e747 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/cgc.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/cgc.go @@ -6,7 +6,7 @@ package xo import ( "sort" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) // Type Cgc encapsulates clause compaction/garbage collection. diff --git a/vendor/github.com/irifrance/gini/internal/xo/chd.go b/vendor/github.com/operator-framework/gini/internal/xo/chd.go similarity index 100% rename from vendor/github.com/irifrance/gini/internal/xo/chd.go rename to vendor/github.com/operator-framework/gini/internal/xo/chd.go diff --git a/vendor/github.com/irifrance/gini/internal/xo/cloc.go b/vendor/github.com/operator-framework/gini/internal/xo/cloc.go similarity index 82% rename from vendor/github.com/irifrance/gini/internal/xo/cloc.go rename to vendor/github.com/operator-framework/gini/internal/xo/cloc.go index ef08e9af49..158d40c3e1 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/cloc.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/cloc.go @@ -3,7 +3,7 @@ package xo -import "github.com/irifrance/gini/z" +import "github.com/operator-framework/gini/z" const ( CNull z.C = 0 diff --git a/vendor/github.com/irifrance/gini/internal/xo/ctl.go b/vendor/github.com/operator-framework/gini/internal/xo/ctl.go similarity index 99% rename from vendor/github.com/irifrance/gini/internal/xo/ctl.go rename to vendor/github.com/operator-framework/gini/internal/xo/ctl.go index 3ac1969d97..5a2d25ee21 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/ctl.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/ctl.go @@ -4,9 +4,10 @@ package xo import ( - "github.com/irifrance/gini/z" "sync" "time" + + "github.com/operator-framework/gini/z" ) // Type Ctl encapsulates low level asynchronous control diff --git a/vendor/github.com/irifrance/gini/internal/xo/derive.go b/vendor/github.com/operator-framework/gini/internal/xo/derive.go similarity index 99% rename from vendor/github.com/irifrance/gini/internal/xo/derive.go rename to vendor/github.com/operator-framework/gini/internal/xo/derive.go index 303de7b3dc..988acf99fc 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/derive.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/derive.go @@ -6,7 +6,7 @@ package xo import ( "fmt" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) type Deriver struct { diff --git a/vendor/github.com/irifrance/gini/internal/xo/dimacs.go b/vendor/github.com/operator-framework/gini/internal/xo/dimacs.go similarity index 91% rename from vendor/github.com/irifrance/gini/internal/xo/dimacs.go rename to vendor/github.com/operator-framework/gini/internal/xo/dimacs.go index 422e0a273a..9478b14a8b 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/dimacs.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/dimacs.go @@ -3,7 +3,7 @@ package xo -import "github.com/irifrance/gini/z" +import "github.com/operator-framework/gini/z" // Type DimacsVis implements dimacs.Vis for constructing // solvers from dimacs cnf files. diff --git a/vendor/github.com/irifrance/gini/internal/xo/doc.go b/vendor/github.com/operator-framework/gini/internal/xo/doc.go similarity index 100% rename from vendor/github.com/irifrance/gini/internal/xo/doc.go rename to vendor/github.com/operator-framework/gini/internal/xo/doc.go diff --git a/vendor/github.com/irifrance/gini/internal/xo/guess.go b/vendor/github.com/operator-framework/gini/internal/xo/guess.go similarity index 99% rename from vendor/github.com/irifrance/gini/internal/xo/guess.go rename to vendor/github.com/operator-framework/gini/internal/xo/guess.go index 84c94ce47f..f5d8414df8 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/guess.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/guess.go @@ -6,7 +6,7 @@ package xo import ( "math" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) const ( diff --git a/vendor/github.com/irifrance/gini/internal/xo/luby.go b/vendor/github.com/operator-framework/gini/internal/xo/luby.go similarity index 100% rename from vendor/github.com/irifrance/gini/internal/xo/luby.go rename to vendor/github.com/operator-framework/gini/internal/xo/luby.go diff --git a/vendor/github.com/irifrance/gini/internal/xo/phases.go b/vendor/github.com/operator-framework/gini/internal/xo/phases.go similarity index 93% rename from vendor/github.com/irifrance/gini/internal/xo/phases.go rename to vendor/github.com/operator-framework/gini/internal/xo/phases.go index 295fbbe6c3..1f3bda755a 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/phases.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/phases.go @@ -1,6 +1,6 @@ package xo -import "github.com/irifrance/gini/z" +import "github.com/operator-framework/gini/z" type phases z.Var diff --git a/vendor/github.com/irifrance/gini/internal/xo/s.go b/vendor/github.com/operator-framework/gini/internal/xo/s.go similarity index 99% rename from vendor/github.com/irifrance/gini/internal/xo/s.go rename to vendor/github.com/operator-framework/gini/internal/xo/s.go index 1ecbc24fb2..7d10639622 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/s.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/s.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "github.com/irifrance/gini/dimacs" - "github.com/irifrance/gini/inter" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/dimacs" + "github.com/operator-framework/gini/inter" + "github.com/operator-framework/gini/z" ) const ( diff --git a/vendor/github.com/irifrance/gini/internal/xo/stats.go b/vendor/github.com/operator-framework/gini/internal/xo/stats.go similarity index 100% rename from vendor/github.com/irifrance/gini/internal/xo/stats.go rename to vendor/github.com/operator-framework/gini/internal/xo/stats.go diff --git a/vendor/github.com/irifrance/gini/internal/xo/tracer.go b/vendor/github.com/operator-framework/gini/internal/xo/tracer.go similarity index 100% rename from vendor/github.com/irifrance/gini/internal/xo/tracer.go rename to vendor/github.com/operator-framework/gini/internal/xo/tracer.go diff --git a/vendor/github.com/irifrance/gini/internal/xo/trail.go b/vendor/github.com/operator-framework/gini/internal/xo/trail.go similarity index 99% rename from vendor/github.com/irifrance/gini/internal/xo/trail.go rename to vendor/github.com/operator-framework/gini/internal/xo/trail.go index 2673242f9c..9f67388c8a 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/trail.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/trail.go @@ -7,7 +7,7 @@ import ( "bytes" "fmt" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) type late struct { diff --git a/vendor/github.com/irifrance/gini/internal/xo/vars.go b/vendor/github.com/operator-framework/gini/internal/xo/vars.go similarity index 98% rename from vendor/github.com/irifrance/gini/internal/xo/vars.go rename to vendor/github.com/operator-framework/gini/internal/xo/vars.go index 5f1dd03d41..02a25fd985 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/vars.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/vars.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) type Vars struct { diff --git a/vendor/github.com/irifrance/gini/internal/xo/watch.go b/vendor/github.com/operator-framework/gini/internal/xo/watch.go similarity index 97% rename from vendor/github.com/irifrance/gini/internal/xo/watch.go rename to vendor/github.com/operator-framework/gini/internal/xo/watch.go index ddf9050bb6..4e30635742 100644 --- a/vendor/github.com/irifrance/gini/internal/xo/watch.go +++ b/vendor/github.com/operator-framework/gini/internal/xo/watch.go @@ -6,7 +6,7 @@ package xo import ( "fmt" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) // Watch holds other blocking literal, clause location ( diff --git a/vendor/github.com/irifrance/gini/logic/c.go b/vendor/github.com/operator-framework/gini/logic/c.go similarity index 98% rename from vendor/github.com/irifrance/gini/logic/c.go rename to vendor/github.com/operator-framework/gini/logic/c.go index 9055ce2992..081d32cc62 100644 --- a/vendor/github.com/irifrance/gini/logic/c.go +++ b/vendor/github.com/operator-framework/gini/logic/c.go @@ -4,8 +4,8 @@ package logic import ( - "github.com/irifrance/gini/inter" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/inter" + "github.com/operator-framework/gini/z" ) // C represents a formula or combinational circuit. diff --git a/vendor/github.com/irifrance/gini/logic/card.go b/vendor/github.com/operator-framework/gini/logic/card.go similarity index 98% rename from vendor/github.com/irifrance/gini/logic/card.go rename to vendor/github.com/operator-framework/gini/logic/card.go index 4620141437..af63f2ff22 100644 --- a/vendor/github.com/irifrance/gini/logic/card.go +++ b/vendor/github.com/operator-framework/gini/logic/card.go @@ -4,7 +4,7 @@ package logic import ( - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/z" ) // Card provides an interface for different implementations diff --git a/vendor/github.com/irifrance/gini/logic/doc.go b/vendor/github.com/operator-framework/gini/logic/doc.go similarity index 100% rename from vendor/github.com/irifrance/gini/logic/doc.go rename to vendor/github.com/operator-framework/gini/logic/doc.go diff --git a/vendor/github.com/irifrance/gini/logic/roll.go b/vendor/github.com/operator-framework/gini/logic/roll.go similarity index 97% rename from vendor/github.com/irifrance/gini/logic/roll.go rename to vendor/github.com/operator-framework/gini/logic/roll.go index 967d2423e6..abd501997f 100644 --- a/vendor/github.com/irifrance/gini/logic/roll.go +++ b/vendor/github.com/operator-framework/gini/logic/roll.go @@ -3,7 +3,7 @@ package logic -import "github.com/irifrance/gini/z" +import "github.com/operator-framework/gini/z" // Roll creates an unroller of sequential logic into // combinational logic. diff --git a/vendor/github.com/irifrance/gini/logic/s.go b/vendor/github.com/operator-framework/gini/logic/s.go similarity index 98% rename from vendor/github.com/irifrance/gini/logic/s.go rename to vendor/github.com/operator-framework/gini/logic/s.go index 6b7e2e2e41..badcae2843 100644 --- a/vendor/github.com/irifrance/gini/logic/s.go +++ b/vendor/github.com/operator-framework/gini/logic/s.go @@ -3,7 +3,7 @@ package logic -import "github.com/irifrance/gini/z" +import "github.com/operator-framework/gini/z" // S adds sequential elements to C, gini's combinational // logic representation. diff --git a/vendor/github.com/irifrance/gini/s.go b/vendor/github.com/operator-framework/gini/s.go similarity index 84% rename from vendor/github.com/irifrance/gini/s.go rename to vendor/github.com/operator-framework/gini/s.go index 55d8ca319b..caa6281b6a 100644 --- a/vendor/github.com/irifrance/gini/s.go +++ b/vendor/github.com/operator-framework/gini/s.go @@ -3,7 +3,7 @@ package gini -import "github.com/irifrance/gini/inter" +import "github.com/operator-framework/gini/inter" // NewS creates a new solver, which is the Gini // implementation of inter.S. diff --git a/vendor/github.com/irifrance/gini/sv.go b/vendor/github.com/operator-framework/gini/sv.go similarity index 95% rename from vendor/github.com/irifrance/gini/sv.go rename to vendor/github.com/operator-framework/gini/sv.go index 58c6fc50a1..546b93c0c2 100644 --- a/vendor/github.com/irifrance/gini/sv.go +++ b/vendor/github.com/operator-framework/gini/sv.go @@ -6,8 +6,8 @@ package gini import ( "time" - "github.com/irifrance/gini/inter" - "github.com/irifrance/gini/z" + "github.com/operator-framework/gini/inter" + "github.com/operator-framework/gini/z" ) type svWrap struct { diff --git a/vendor/github.com/irifrance/gini/z/c.go b/vendor/github.com/operator-framework/gini/z/c.go similarity index 100% rename from vendor/github.com/irifrance/gini/z/c.go rename to vendor/github.com/operator-framework/gini/z/c.go diff --git a/vendor/github.com/irifrance/gini/z/doc.go b/vendor/github.com/operator-framework/gini/z/doc.go similarity index 100% rename from vendor/github.com/irifrance/gini/z/doc.go rename to vendor/github.com/operator-framework/gini/z/doc.go diff --git a/vendor/github.com/irifrance/gini/z/dv.go b/vendor/github.com/operator-framework/gini/z/dv.go similarity index 100% rename from vendor/github.com/irifrance/gini/z/dv.go rename to vendor/github.com/operator-framework/gini/z/dv.go diff --git a/vendor/github.com/irifrance/gini/z/lit.go b/vendor/github.com/operator-framework/gini/z/lit.go similarity index 100% rename from vendor/github.com/irifrance/gini/z/lit.go rename to vendor/github.com/operator-framework/gini/z/lit.go diff --git a/vendor/github.com/irifrance/gini/z/var.go b/vendor/github.com/operator-framework/gini/z/var.go similarity index 100% rename from vendor/github.com/irifrance/gini/z/var.go rename to vendor/github.com/operator-framework/gini/z/var.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 499ea3a6ae..74d4d25cf6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -333,14 +333,6 @@ github.com/huandu/xstrings github.com/imdario/mergo # github.com/inconshreveable/mousetrap v1.0.0 github.com/inconshreveable/mousetrap -# github.com/irifrance/gini v1.0.1 -## explicit -github.com/irifrance/gini -github.com/irifrance/gini/dimacs -github.com/irifrance/gini/inter -github.com/irifrance/gini/internal/xo -github.com/irifrance/gini/logic -github.com/irifrance/gini/z # github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645 github.com/itchyny/astgen-go # github.com/itchyny/gojq v0.11.0 @@ -515,6 +507,14 @@ github.com/operator-framework/api/pkg/validation github.com/operator-framework/api/pkg/validation/errors github.com/operator-framework/api/pkg/validation/interfaces github.com/operator-framework/api/pkg/validation/internal +# github.com/operator-framework/gini v1.1.0 +## explicit +github.com/operator-framework/gini +github.com/operator-framework/gini/dimacs +github.com/operator-framework/gini/inter +github.com/operator-framework/gini/internal/xo +github.com/operator-framework/gini/logic +github.com/operator-framework/gini/z # github.com/operator-framework/operator-registry v1.17.5 ## explicit github.com/operator-framework/operator-registry/internal/model