kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-04 08:45:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build formulas recursively

Browse Source
This commit is contained in:
Ettore Di Giacinto
2019-06-03 23:23:02 +02:00
parent e6239f416b
commit 5184a26e69
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/package/package.go
View File

@@ -143,6 +143,12 @@ func (p *DefaultPackage) BuildFormula() ([]bf.Formula, error) {
}
B := bf.Var(encodedB)
f, err := required.BuildFormula()
if err != nil {
return nil, err
}
formulas = append(formulas, f...)
formulas = append(formulas, bf.Or(bf.Not(A), bf.And(A, B)))
}
@@ -153,10 +159,17 @@ func (p *DefaultPackage) BuildFormula() ([]bf.Formula, error) {
return nil, err
}
B := bf.Var(encodedB)
f, err := required.BuildFormula()
if err != nil {
return nil, err
}
formulas = append(formulas, bf.Or(bf.Not(A),
bf.And(A, bf.Not(B))))
formulas = append(formulas, f...)
}
return formulas, nil
return []bf.Formula{bf.Implies(A, bf.And(formulas...))}, nil
}

19
pkg/solver/solver_test.go
View File

@@ -37,10 +37,27 @@ var _ = Describe("Solver", func() {
solution, err := s.Solve()
Expect(err).ToNot(HaveOccurred())
Expect(solution).To(ContainElement(A.IsFlagged(true)))
Expect(solution).To(ContainElement(B.IsFlagged(true)))
Expect(solution).To(ContainElement(C.IsFlagged(true)))
// Expect(solution).To(ContainElement(A.IsFlagged(true)))
})
It("Solves correctly more complex ones", func() {
C := pkg.NewPackage("C", "", []pkg.Package{}, []pkg.Package{})
D := pkg.NewPackage("D", "", []pkg.Package{}, []pkg.Package{})
B := pkg.NewPackage("B", "", []pkg.Package{D}, []pkg.Package{})
A := pkg.NewPackage("A", "", []pkg.Package{B}, []pkg.Package{})
C.IsFlagged(true) // installed
s := NewSolver([]pkg.Package{A.IsFlagged(true)}, []pkg.Package{C})
solution, err := s.Solve()
Expect(solution).To(ContainElement(C.IsFlagged(true)))
Expect(solution).To(ContainElement(D.IsFlagged(true)))
Expect(solution).To(ContainElement(B.IsFlagged(true)))
Expect(err).ToNot(HaveOccurred())
})
})
Context("Conflict set", func() {