Skip to content

Commit d6b8644

Browse files
authored
Merge pull request #343 from sir-gon/develop
[REFACTOR] golang Analyzer modernize:
2 parents 378fffb + 26afd72 commit d6b8644

File tree

18 files changed

+45
-55
lines changed

18 files changed

+45
-55
lines changed

exercises/hackerrank/interview_preparation_kit/arrays/2d_array.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func hourglassSum(arr [][]int32) int32 {
3636
for j := int32(matrixStartIndex); j <= int32(matrixEndIndex); j++ {
3737
var currentHourglassSum int32 = 0
3838
currentHourglass := getHourGlass(arr, i, j)
39-
for k := 0; k < len(currentHourglass); k++ {
39+
for k := range currentHourglass {
4040
currentHourglassSum += currentHourglass[k]
4141
}
4242

exercises/hackerrank/interview_preparation_kit/arrays/ctci_array_left_rotation.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ func rotLeftOne(a []int32) []int32 {
1616

1717
func rotLeft(a []int32, d int32) []int32 {
1818
x := a[:]
19-
var i int32
2019

21-
for i = 0; i < d; i++ {
20+
for range d {
2221
x = rotLeftOne(x)
2322
}
2423
return x

exercises/hackerrank/interview_preparation_kit/dictionaries_and_hashmaps/count-triplets-1.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package hackerrank
77
func countTripletsBruteForce(arr []int64, r int64) int64 {
88
size := len(arr)
99
counter := int64(0)
10-
for i := 0; i < size-2; i++ {
10+
for i := range size - 2 {
1111
for j := i + 1; j < size-1; j++ {
1212
for k := j + 1; k < size; k++ {
1313
if r*arr[i] == arr[j] && r*arr[j] == arr[k] {

exercises/hackerrank/interview_preparation_kit/dictionaries_and_hashmaps/sherlock-and-anagrams.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ func sherlockAndAnagrams(s string) int32 {
2727
candidates := make(map[string][]string)
2828
size := len(s)
2929

30-
for i := 0; i < size; i++ {
31-
for j := 0; j < size-i; j++ {
30+
for i := range size {
31+
for j := range size - i {
3232
substr := s[i : size-j]
3333

3434
log.Debug("i: %d, size: %d, size - j: %d | substr: %s",

exercises/hackerrank/warmup/aVeryBigSum.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import "gon.cl/algorithms/utils/log"
99
func AVeryBigSum(ar []uint64) uint64 {
1010
var result uint64 = 0
1111

12-
for i := 0; i < len(ar); i++ {
12+
for i := range ar {
1313
result += ar[i]
1414
}
1515

exercises/hackerrank/warmup/compareTriplets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func CompareTriplets(a []int, b []int) ([]int, error) {
1818

1919
var awards = []int{0, 0}
2020

21-
for i := 0; i < len(a); i++ {
21+
for i := range a {
2222
if a[i] > b[i] {
2323
awards[0] = awards[0] + 1
2424
}

exercises/hackerrank/warmup/diagonalDifference.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ func DiagonalDifference(arr [][]int) int {
1515
diag2 := 0
1616
last := len(arr) - 1
1717

18-
for i := 0; i < len(arr); i++ {
19-
for j := 0; j < len(arr); j++ {
18+
for i := range arr {
19+
for j := range arr {
2020
if i == j {
2121
diag1 += arr[i][j]
2222
diag2 += arr[last-i][j]
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @link Problem definition [[docs/hackerrank/warmup/miniMaxSum.md]]
2+
* @link Problem definition [[docs/hackerrank/warmup/minimumiMaxSum.md]]
33
*/
44

55
package hackerrank
@@ -15,21 +15,21 @@ func MiniMaxSum(arr []int) (string, error) {
1515
}
1616

1717
sum := 0
18-
min := arr[0]
19-
max := arr[1]
18+
minimum := arr[0]
19+
maximum := arr[1]
2020

21-
for i := 0; i < len(arr); i++ {
21+
for i := range arr {
2222
num := arr[i]
2323
sum += num
2424

25-
if num < min {
26-
min = num
25+
if num < minimum {
26+
minimum = num
2727
}
2828

29-
if num > max {
30-
max = num
29+
if num > maximum {
30+
maximum = num
3131
}
3232
}
3333

34-
return fmt.Sprintf("%d %d", sum-max, sum-min), nil
34+
return fmt.Sprintf("%d %d", sum-maximum, sum-minimum), nil
3535
}

exercises/hackerrank/warmup/simpleArraySum.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import "gon.cl/algorithms/utils/log"
99
func SimpleArraySum(arr []int) int {
1010
acum := 0
1111

12-
for i := 0; i < len(arr); i++ {
12+
for i := range arr {
1313
acum += arr[i]
1414
}
1515

exercises/projecteuler/helpers/divisors.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package helpers
22

33
import (
44
"math"
5-
"sort"
5+
"slices"
66

77
"gon.cl/algorithms/utils/log"
88
)
@@ -53,7 +53,7 @@ func Divisors(target int) []int {
5353
log.Debug("collected divisors %x", divs)
5454

5555
// sort divisors
56-
sort.Slice(divs, func(i, j int) bool { return divs[i] < divs[j] })
56+
slices.Sort(divs)
5757
log.Debug("sorted divisors %x", divs)
5858

5959
return divs

exercises/projecteuler/helpers/matrix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package helpers
33
func Matrix(m int, n int, init int) [][]int {
44
var matrix [][]int
55

6-
for i := 0; i < m; i++ {
6+
for range m {
77
row := []int{}
8-
for j := 0; j < n; j++ {
8+
for range n {
99
row = append(row, init)
1010
}
1111
matrix = append(matrix, row)

exercises/projecteuler/helpers/sum.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ func Sum(listOfNums []int) int {
44

55
var sum int
66

7-
for i := 0; i < len(listOfNums); i++ {
7+
for i := range listOfNums {
88
sum += listOfNums[i]
99
}
1010

exercises/projecteuler/problem0001.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
func Problem0001(top int) int {
1212
total := 0
1313

14-
for i := 0; i < top; i++ {
14+
for i := range top {
1515
if i%3 == 0 || i%5 == 0 {
1616

1717
total += i

exercises/projecteuler/problem0008.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func Problem0008(numberInput string) int {
3434
for i := bottom; i <= top-interval; i += 1 {
3535
var digitsSet []int
3636

37-
for j := 0; j < interval; j++ {
37+
for j := range interval {
3838
digitsSet = append(digitsSet, int(digitsSlice[i+j]))
3939
}
4040

exercises/projecteuler/problem0022.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func Problem0022(listOfNames []string) int {
1919

2020
sort.Strings(listOfNames)
2121

22-
for i := 0; i < len(listOfNames); i++ {
22+
for i := range listOfNames {
2323
answer += (i + 1) * helpers.WordScore(listOfNames[i])
2424
}
2525

exercises/projecteuler/problem0023.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,12 @@
55
package projecteuler
66

77
import (
8-
"golang.org/x/exp/slices"
8+
slices "slices"
9+
910
"gon.cl/algorithms/exercises/projecteuler/helpers"
1011
"gon.cl/algorithms/utils/log"
1112
)
1213

13-
func Contains[T comparable](s []T, e T) bool {
14-
for _, v := range s {
15-
if v == e {
16-
return true
17-
}
18-
}
19-
return false
20-
}
21-
2214
func Problem0023(underLimit int, superLimit int) int {
2315

2416
var abundantNumberList = []int{}
@@ -38,7 +30,7 @@ func Problem0023(underLimit int, superLimit int) int {
3830
var sumsAbundantNums = []int{}
3931

4032
// Produce a list of sums of pair of abundant numbers below limit
41-
for i := 0; i < len(abundantNumberList); i++ {
33+
for i := range abundantNumberList {
4234
for j := 0; abundantNumberList[i]+abundantNumberList[j] <= superLimit &&
4335
j < len(abundantNumberList); j++ {
4436

@@ -62,7 +54,7 @@ func Problem0023(underLimit int, superLimit int) int {
6254
var found = []int{}
6355

6456
for i := 1; i < superLimit; i++ {
65-
if !Contains(sumsAbundantNums, i) {
57+
if !slices.Contains(sumsAbundantNums, i) {
6658
found = append(found, i)
6759
}
6860
}

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.22.0
55
require (
66
github.com/stretchr/testify v1.10.0
77
go.uber.org/zap v1.27.0
8-
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
98
)
109

1110
require (

utils/log/logger.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,43 +102,43 @@ func (logger *Log) WithError(err error) *Log {
102102
return logCustom
103103
}
104104

105-
func WithField(key string, value interface{}) *Log { return instance.WithField(key, value) }
106-
func (logger *Log) WithField(key string, value interface{}) *Log {
105+
func WithField(key string, value any) *Log { return instance.WithField(key, value) }
106+
func (logger *Log) WithField(key string, value any) *Log {
107107
logCustom := &Log{
108108
log: initLoggerZap(),
109109
}
110110
logCustom.log = logCustom.log.With(zap.Any(key, value))
111111
return logCustom
112112
}
113113

114-
func Info(message string, args ...interface{}) { instance.Info(message, args...) }
115-
func (logger *Log) Info(message string, args ...interface{}) {
114+
func Info(message string, args ...any) { instance.Info(message, args...) }
115+
func (logger *Log) Info(message string, args ...any) {
116116
logger.log.Info(fmt.Sprintf(message, args...))
117117
}
118118

119-
func Error(message string, args ...interface{}) { instance.Error(message, args...) }
120-
func (logger *Log) Error(message string, args ...interface{}) {
119+
func Error(message string, args ...any) { instance.Error(message, args...) }
120+
func (logger *Log) Error(message string, args ...any) {
121121
logger.log.Error(fmt.Sprintf(message, args...))
122122
}
123123

124-
func Debug(message string, args ...interface{}) { instance.Debug(message, args...) }
125-
func (logger *Log) Debug(message string, args ...interface{}) {
124+
func Debug(message string, args ...any) { instance.Debug(message, args...) }
125+
func (logger *Log) Debug(message string, args ...any) {
126126
logger.log.Debug(fmt.Sprintf(message, args...))
127127
}
128128

129-
func Warn(message string, args ...interface{}) { instance.Warn(message, args...) }
130-
func (logger *Log) Warn(message string, args ...interface{}) {
129+
func Warn(message string, args ...any) { instance.Warn(message, args...) }
130+
func (logger *Log) Warn(message string, args ...any) {
131131
logger.log.Warn(fmt.Sprintf(message, args...))
132132
}
133133

134-
func Fatal(message string, args ...interface{}) { instance.Fatal(message, args...) }
135-
func (logger *Log) Fatal(message string, args ...interface{}) {
134+
func Fatal(message string, args ...any) { instance.Fatal(message, args...) }
135+
func (logger *Log) Fatal(message string, args ...any) {
136136
logger.log.Fatal(fmt.Sprintf(message, args...))
137137
}
138138

139-
func Printf(message string, args ...interface{}) {
139+
func Printf(message string, args ...any) {
140140
instance.Printf(message, args...)
141141
}
142-
func (logger *Log) Printf(message string, args ...interface{}) {
142+
func (logger *Log) Printf(message string, args ...any) {
143143
logger.log.Info(fmt.Sprintf(message, args...))
144144
}

0 commit comments

Comments
 (0)