added optional functions to lfu lru

Author: Code-Hex

cache.go

@@ -82,16 +82,16 @@ func newOptions[K comparable, V any]() *options[K, V] {
 }
 
 // AsLRU is an option to make a new Cache as LRU algorithm.
-func AsLRU[K comparable, V any](cap int) Option[K, V] {
+func AsLRU[K comparable, V any](opts ...lru.Option) Option[K, V] {
 	return func(o *options[K, V]) {
-		o.cache = lru.NewCacheWithCap[K, *Item[K, V]](cap)
+		o.cache = lru.NewCache[K, *Item[K, V]](opts...)
 	}
 }
 
 // AsLFU is an option to make a new Cache as LFU algorithm.
-func AsLFU[K comparable, V any](cap int) Option[K, V] {
+func AsLFU[K comparable, V any](opts ...lfu.Option) Option[K, V] {
 	return func(o *options[K, V]) {
-		o.cache = lfu.NewCacheWithCap[K, *Item[K, V]](cap)
+		o.cache = lfu.NewCache[K, *Item[K, V]](opts...)
 	}
 }
 

example_test.go

@@ -21,7 +21,7 @@ func ExampleCache() {
 }
 
 func ExampleCacheWithExpiration() {
-	c := cache.New(cache.AsLFU[string, int](128))
+	c := cache.New(cache.AsLFU[string, int]())
 	exp := 250 * time.Millisecond
 	c.Set("a", 1, cache.WithExpiration(exp))
 
@@ -46,7 +46,7 @@ func ExampleCacheWithExpiration() {
 }
 
 func ExampleDelete() {
-	c := cache.New(cache.AsLRU[string, int](128))
+	c := cache.New(cache.AsLRU[string, int]())
 	c.Set("a", 1)
 	c.Delete("a")
 	gota, aok := c.Get("a")
@@ -56,7 +56,7 @@ func ExampleDelete() {
 }
 
 func ExampleKeys() {
-	c := cache.New(cache.AsLFU[string, int](128))
+	c := cache.New(cache.AsLFU[string, int]())
 	c.Set("a", 1)
 	c.Set("b", 1)
 	c.Set("c", 1)
@@ -66,7 +66,7 @@ func ExampleKeys() {
 }
 
 func ExampleContains() {
-	c := cache.New(cache.AsLRU[string, int](128))
+	c := cache.New(cache.AsLRU[string, int]())
 	c.Set("a", 1)
 	fmt.Println(c.Contains("a"))
 	fmt.Println(c.Contains("b"))

lfu/lfu.go

@@ -11,17 +11,36 @@ type Cache[K comparable, V any] struct {
 	items map[K]*entry[K, V]
 }
 
-// NewCache creates a new LFU cache whose capacity is the default size (128).
-func NewCache[K comparable, V any]() *Cache[K, V] {
-	return NewCacheWithCap[K, V](128)
+// Option is an option for LFU cache.
+type Option func(*options)
+
+type options struct {
+	capacity int
+}
+
+func newOptions() *options {
+	return &options{
+		capacity: 128,
+	}
 }
 
-// NewCacheWithCap creates a new LFU cache whose capacity is the specified size.
-func NewCacheWithCap[K comparable, V any](cap int) *Cache[K, V] {
+// WithCapacity is an option to set cache capacity.
+func WithCapacity(cap int) Option {
+	return func(o *options) {
+		o.capacity = cap
+	}
+}
+
+// NewCache creates a new LFU cache whose capacity is the default size (128).
+func NewCache[K comparable, V any](opts ...Option) *Cache[K, V] {
+	o := newOptions()
+	for _, optFunc := range opts {
+		optFunc(o)
+	}
 	return &Cache[K, V]{
-		cap:   cap,
-		queue: newPriorityQueue[K, V](cap),
-		items: make(map[K]*entry[K, V], cap),
+		cap:   o.capacity,
+		queue: newPriorityQueue[K, V](o.capacity),
+		items: make(map[K]*entry[K, V], o.capacity),
 	}
 }
 

lfu/lfu_test.go

@@ -8,7 +8,7 @@ import (
 
 func TestSet(t *testing.T) {
 	// set capacity is 1
-	cache := lfu.NewCacheWithCap[string, int](1)
+	cache := lfu.NewCache[string, int](lfu.WithCapacity(1))
 	cache.Set("foo", 1)
 	if got := cache.Len(); got != 1 {
 		t.Fatalf("invalid length: %d", got)
@@ -44,7 +44,7 @@ func TestSet(t *testing.T) {
 }
 
 func TestDelete(t *testing.T) {
-	cache := lfu.NewCacheWithCap[string, int](1)
+	cache := lfu.NewCache[string, int](lfu.WithCapacity(1))
 	cache.Set("foo", 1)
 	if got := cache.Len(); got != 1 {
 		t.Fatalf("invalid length: %d", got)

lru/lru.go

@@ -16,17 +16,36 @@ type entry[K comparable, V any] struct {
 	val V
 }
 
-// NewCache creates a new LRU cache whose capacity is the default size (128).
-func NewCache[K comparable, V any]() *Cache[K, V] {
-	return NewCacheWithCap[K, V](128)
+// Option is an option for LFU cache.
+type Option func(*options)
+
+type options struct {
+	capacity int
+}
+
+func newOptions() *options {
+	return &options{
+		capacity: 128,
+	}
 }
 
-// NewCacheWithCap creates a new LRU cache whose capacity is the specified size.
-func NewCacheWithCap[K comparable, V any](cap int) *Cache[K, V] {
+// WithCapacity is an option to set cache capacity.
+func WithCapacity(cap int) Option {
+	return func(o *options) {
+		o.capacity = cap
+	}
+}
+
+// NewCache creates a new LRU cache whose capacity is the default size (128).
+func NewCache[K comparable, V any](opts ...Option) *Cache[K, V] {
+	o := newOptions()
+	for _, optFunc := range opts {
+		optFunc(o)
+	}
 	return &Cache[K, V]{
-		cap:   cap,
+		cap:   o.capacity,
 		list:  list.New(),
-		items: make(map[K]*list.Element, cap),
+		items: make(map[K]*list.Element, o.capacity),
 	}
 }
 

lru/lru_test.go

@@ -8,7 +8,7 @@ import (
 
 func TestSet(t *testing.T) {
 	// set capacity is 1
-	cache := lru.NewCacheWithCap[string, int](1)
+	cache := lru.NewCache[string, int](lru.WithCapacity(1))
 	cache.Set("foo", 1)
 	if got := cache.Len(); got != 1 {
 		t.Fatalf("invalid length: %d", got)
@@ -44,7 +44,7 @@ func TestSet(t *testing.T) {
 }
 
 func TestDelete(t *testing.T) {
-	cache := lru.NewCacheWithCap[string, int](1)
+	cache := lru.NewCache[string, int](lru.WithCapacity(1))
 	cache.Set("foo", 1)
 	if got := cache.Len(); got != 1 {
 		t.Fatalf("invalid length: %d", got)