diff --git a/ch05/addMat.go b/ch05/addMat.go index 34a431a..f5865bd 100644 --- a/ch05/addMat.go +++ b/ch05/addMat.go @@ -2,13 +2,77 @@ package main import ( "fmt" + "math/rand" + "os" + "strconv" ) -func negativeMatrix() error { +func random(min, max int) int { + return rand.Intn(max-min) + min +} - return nil +func negativeMatrix(s [][]int) [][]int { + for i, x := range s { + for j, _ := range x { + s[i][j] = -s[i][j] + } + } + return s +} + +func addMatrices(m1 [][]int, m2 [][]int) [][]int { + result := make([][]int, len(m1)) + for i, x := range m1 { + for j, _ := range x { + result[i] = append(result[i], m1[i][j]+m2[i][j]) + } + } + return result } func main() { + arguments := os.Args + if len(arguments) != 3 { + fmt.Println("Wrong number of arguments!") + return + } + var row, col int + row, err := strconv.Atoi(arguments[1]) + if err != nil { + fmt.Println("Need an integer: ", arguments[1]) + return + } + + col, err = strconv.Atoi(arguments[2]) + if err != nil { + fmt.Println("Need an integer: ", arguments[2]) + return + } + fmt.Printf("Using %dx%d arrays\n", row, col) + + if col <= 0 || row <= 0 { + fmt.Println("Need positive matrix dimensions!") + return + } + + m1 := make([][]int, row) + m2 := make([][]int, row) + + // Initialize m1 and m2 with random numbers + for i := 0; i < row; i++ { + for j := 0; j < col; j++ { + m1[i] = append(m1[i], random(-1, i*j+rand.Intn(10))) + m2[i] = append(m2[i], random(-1, i*j+rand.Intn(10))) + } + } + fmt.Println("m1:", m1) + fmt.Println("m2:", m2) + + // Adding + r1 := addMatrices(m1, m2) + // Subtracting + r2 := addMatrices(m1, negativeMatrix(m2)) + fmt.Println("r1:", r1) + fmt.Println("r2:", r2) } diff --git a/ch05/dimensions.go b/ch05/dimensions.go new file mode 100644 index 0000000..e69de29 diff --git a/ch05/mulMat.go b/ch05/mulMat.go index 2fd0fd2..c3872f8 100644 --- a/ch05/mulMat.go +++ b/ch05/mulMat.go @@ -1,9 +1,101 @@ package main import ( + "errors" "fmt" + "math/rand" + "os" + "strconv" + "time" ) +func random(min, max int) int { + return rand.Intn(max-min) + min +} + +func multiplyMatrices(m1 [][]int, m2 [][]int) ([][]int, error) { + if len(m1[0]) != len(m2) { + return nil, errors.New("Cannot multiply the given matrices!") + } + + result := make([][]int, len(m1)) + for i := 0; i < len(m1); i++ { + result[i] = make([]int, len(m2[0])) + for j := 0; j < len(m2[0]); j++ { + for k := 0; k < len(m2); k++ { + result[i][j] += m1[i][k] * m2[k][j] + } + } + } + return result, nil +} + +func createMatrix(row, col int) [][]int { + r := make([][]int, row) + for i := 0; i < row; i++ { + for j := 0; j < col; j++ { + r[i] = append(r[i], random(-5, i*j)) + } + } + return r +} + func main() { + rand.Seed(time.Now().Unix()) + arguments := os.Args + if len(arguments) != 5 { + fmt.Println("Wrong number of arguments!") + return + } + + var row, col int + row, err := strconv.Atoi(arguments[1]) + if err != nil { + fmt.Println("Need an integer: ", arguments[1]) + return + } + + col, err = strconv.Atoi(arguments[2]) + if err != nil { + fmt.Println("Need an integer: ", arguments[2]) + return + } + + if col <= 0 || row <= 0 { + fmt.Println("Need positive matrix dimensions!") + return + } + fmt.Printf("m1 is a %dx%d matrix\n", row, col) + // Initialize m1 with random numbers + m1 := createMatrix(row, col) + + row, err = strconv.Atoi(arguments[3]) + if err != nil { + fmt.Println("Need an integer: ", arguments[3]) + return + } + + col, err = strconv.Atoi(arguments[4]) + if err != nil { + fmt.Println("Need an integer: ", arguments[4]) + return + } + + if col <= 0 || row <= 0 { + fmt.Println("Need positive matrix dimensions!") + return + } + fmt.Printf("m2 is a %dx%d matrix\n", row, col) + // Initialize m2 with random numbers + m2 := createMatrix(row, col) + fmt.Println("m1:", m1) + fmt.Println("m2:", m2) + // Multiply + r1, err := multiplyMatrices(m1, m2) + if err != nil { + fmt.Println(err) + return + } + fmt.Println("r1:", r1) }