Merge pull request #16 from flycash/dev

Adding compare methods for float and adding sorting methods for  int64, int32

math/compare.go

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gxmath
+
+// equivalent to math.Abs(expected - actual) <= delta
+func DeltaCompareFloat64(expected float64, actual float64, delta float64) bool {
+	if expected > actual {
+		return expected-actual <= delta
+	}
+	return actual-expected <= delta
+}
+
+func DeltaCompareFloat32(expected float32, actual float32, delta float32) bool {
+	if expected > actual {
+		return expected-actual <= delta
+	}
+	return actual-expected <= delta
+}

math/compare_test.go

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gxmath
+
+import (
+	"testing"
+)
+
+import (
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFloat64(t *testing.T) {
+	assert.True(t, DeltaCompareFloat64(12.3334, 12.3344, 0.01))
+	assert.True(t, DeltaCompareFloat64(12.3334, 12.32981, 0.01))
+	assert.False(t, DeltaCompareFloat64(12.3334, 12.0325, 0.01))
+}
+
+func TestCompareFloat32(t *testing.T) {
+	assert.True(t, DeltaCompareFloat32(12.3334, 12.3344, 0.01))
+	assert.True(t, DeltaCompareFloat32(12.3334, 12.32981, 0.01))
+	assert.False(t, DeltaCompareFloat64(12.3334, 12.0325, 0.01))
+}

sort/sort.go

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gxsort
+
+import (
+	"sort"
+)
+
+func Int64(slice []int64) {
+	sort.Sort(Int64Slice(slice))
+}
+
+func Int32(slice []int32) {
+	sort.Sort(Int32Slice(slice))
+}
+
+type Int64Slice []int64
+
+func (p Int64Slice) Len() int {
+	return len(p)
+}
+
+func (p Int64Slice) Less(i, j int) bool {
+	return p[i] < p[j]
+}
+
+func (p Int64Slice) Swap(i, j int) {
+	p[i], p[j] = p[j], p[i]
+}
+
+type Int32Slice []int32
+
+func (p Int32Slice) Len() int {
+	return len(p)
+}
+
+func (p Int32Slice) Less(i, j int) bool {
+	return p[i] < p[j]
+}
+
+func (p Int32Slice) Swap(i, j int) {
+	p[i], p[j] = p[j], p[i]
+}

sort/sort_test.go

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gxsort
+
+import (
+	"testing"
+)
+
+import (
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSortInt32(t *testing.T) {
+	data := []int32{3, 5, 1, 9, 0, 2, 2}
+	Int32(data)
+	assert.Equal(t, int32(0), data[0])
+	assert.Equal(t, int32(1), data[1])
+	assert.Equal(t, int32(2), data[2])
+	assert.Equal(t, int32(2), data[3])
+	assert.Equal(t, int32(3), data[4])
+	assert.Equal(t, int32(5), data[5])
+	assert.Equal(t, int32(9), data[6])
+}
+
+func TestSortInt64(t *testing.T) {
+	data := []int64{3, 5, 1, 9, 0, 2, 2}
+	Int64(data)
+	assert.Equal(t, int64(0), data[0])
+	assert.Equal(t, int64(1), data[1])
+	assert.Equal(t, int64(2), data[2])
+	assert.Equal(t, int64(2), data[3])
+	assert.Equal(t, int64(3), data[4])
+	assert.Equal(t, int64(5), data[5])
+	assert.Equal(t, int64(9), data[6])
+}