mirror of
https://github.com/luxfi/math.git
synced 2026-09-24 00:25:16 +00:00
Add missing Set methods and fix tests
- Make Add() variadic to accept multiple elements - Add Overlaps() method to check for common elements - Add Pop() method to remove and return an element - Add NewSet() constructor with optional initial capacity - Implement MarshalJSON/UnmarshalJSON for JSON serialization - Fix test to use return values from Union/Difference All tests now passing.
This commit is contained in:
+79
-3
@@ -1,5 +1,10 @@
|
||||
package set
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"sort"
|
||||
)
|
||||
|
||||
// Set represents a set of unique elements
|
||||
type Set[T comparable] map[T]struct{}
|
||||
|
||||
@@ -12,9 +17,11 @@ func Of[T comparable](elements ...T) Set[T] {
|
||||
return s
|
||||
}
|
||||
|
||||
// Add adds an element to the set
|
||||
func (s Set[T]) Add(element T) {
|
||||
s[element] = struct{}{}
|
||||
// Add adds one or more elements to the set
|
||||
func (s Set[T]) Add(elements ...T) {
|
||||
for _, element := range elements {
|
||||
s[element] = struct{}{}
|
||||
}
|
||||
}
|
||||
|
||||
// Contains checks if an element is in the set
|
||||
@@ -95,3 +102,72 @@ func (s Set[T]) Equals(other Set[T]) bool {
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// Overlaps checks if two sets have any common elements
|
||||
func (s Set[T]) Overlaps(other Set[T]) bool {
|
||||
for k := range s {
|
||||
if other.Contains(k) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// Pop removes and returns an arbitrary element from the set
|
||||
// Returns the element and true if the set was non-empty, otherwise returns zero value and false
|
||||
func (s Set[T]) Pop() (T, bool) {
|
||||
for k := range s {
|
||||
delete(s, k)
|
||||
return k, true
|
||||
}
|
||||
var zero T
|
||||
return zero, false
|
||||
}
|
||||
|
||||
// NewSet creates a new empty set with optional initial capacity
|
||||
func NewSet[T comparable](capacity ...int) Set[T] {
|
||||
if len(capacity) > 0 && capacity[0] > 0 {
|
||||
return make(Set[T], capacity[0])
|
||||
}
|
||||
return make(Set[T])
|
||||
}
|
||||
|
||||
// MarshalJSON implements json.Marshaler interface
|
||||
// Marshals the set as a JSON array of elements in sorted order
|
||||
func (s Set[T]) MarshalJSON() ([]byte, error) {
|
||||
// Convert set to slice for marshaling
|
||||
list := s.List()
|
||||
|
||||
// Sort for consistent output (best effort for common types)
|
||||
if len(list) > 1 {
|
||||
switch any(list).(type) {
|
||||
case []int:
|
||||
sort.Ints(any(list).([]int))
|
||||
case []string:
|
||||
sort.Strings(any(list).([]string))
|
||||
case []float64:
|
||||
sort.Float64s(any(list).([]float64))
|
||||
}
|
||||
}
|
||||
|
||||
return json.Marshal(list)
|
||||
}
|
||||
|
||||
// UnmarshalJSON implements json.Unmarshaler interface
|
||||
// Unmarshals a JSON array into a set, replacing existing contents
|
||||
func (s *Set[T]) UnmarshalJSON(data []byte) error {
|
||||
var list []T
|
||||
if err := json.Unmarshal(data, &list); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Create a new set to replace existing contents
|
||||
*s = make(Set[T], len(list))
|
||||
|
||||
// Add all elements from the list
|
||||
for _, element := range list {
|
||||
(*s)[element] = struct{}{}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
+2
-2
@@ -37,11 +37,11 @@ func TestSet(t *testing.T) {
|
||||
|
||||
require.False(s.Overlaps(s2))
|
||||
|
||||
s2.Union(s)
|
||||
s2 = s2.Union(s)
|
||||
require.True(s2.Contains(id1))
|
||||
require.True(s.Overlaps(s2))
|
||||
|
||||
s2.Difference(s)
|
||||
s2 = s2.Difference(s)
|
||||
require.False(s2.Contains(id1))
|
||||
require.False(s.Overlaps(s2))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user