Skip to content

Fixed plot interface where addColumn and addRow could not be accessed ex... #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
buger merged 1 commit into from
Apr 16, 2014
Merged

Fixed plot interface where addColumn and addRow could not be accessed ex... #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ type DataTable struct {
rows [][]float64
}

func (d *DataTable) addColumn(name string) {
func (d *DataTable) AddColumn(name string) {
d.columns = append(d.columns, name)
}

func (d *DataTable) addRow(elms ...float64) {
func (d *DataTable) AddRow(elms ...float64) {
d.rows = append(d.rows, elms)
}

Expand Down
36 changes: 18 additions & 18 deletions plot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
func TestCreateDataTable(t *testing.T) {
data := new(DataTable)

data.addColumn("Gender")
data.addColumn("Age")
data.AddColumn("Gender")
data.AddColumn("Age")

if len(data.columns) != 2 {
t.Error("Should be 2 columns")
Expand All @@ -21,8 +21,8 @@ func TestCreateDataTable(t *testing.T) {
t.Error("Should have proper column name")
}

data.addRow(1, 5)
data.addRow(0, 4)
data.AddRow(1, 5)
data.AddRow(0, 4)

if len(data.rows) != 2 {
t.Error("Should have 2 rows")
Expand All @@ -40,14 +40,14 @@ func TestLineChartIndependent(t *testing.T) {
chart.Flags = DRAW_INDEPENDENT //| DRAW_RELATIVE

data := new(DataTable)
data.addColumn("Time")
data.addColumn("Lat")
data.addColumn("Count")
data.AddColumn("Time")
data.AddColumn("Lat")
data.AddColumn("Count")

//data.addColumn("x*x")
//data.AddColumn("x*x")

for i := 0; i < 60; i++ {
data.addRow(float64(i+60), float64(20+rand.Intn(10)), float64(i*2+rand.Intn(i+1))) // ,*/, x*x)
data.AddRow(float64(i+60), float64(20+rand.Intn(10)), float64(i*2+rand.Intn(i+1))) // ,*/, x*x)
}

fmt.Println(chart.Draw(data))
Expand All @@ -60,14 +60,14 @@ func TestLineChartRelative(t *testing.T) {
chart.Flags = DRAW_RELATIVE

data := new(DataTable)
data.addColumn("X")
data.addColumn("Sin(x)")
data.addColumn("Cos(x+1)")
data.AddColumn("X")
data.AddColumn("Sin(x)")
data.AddColumn("Cos(x+1)")

//data.addColumn("x*x")
//data.AddColumn("x*x")

for i := 0.1; i < 10; i += 0.1 {
data.addRow(i, math.Sin(i), math.Cos(i+1))
data.AddRow(i, math.Sin(i), math.Cos(i+1))
}

fmt.Println(chart.Draw(data))
Expand All @@ -80,12 +80,12 @@ func TestLineChart(t *testing.T) {
//chart.Flags = /*DRAW_INDEPENDENT // | */// DRAW_RELATIVE

data := new(DataTable)
data.addColumn("x")
data.addColumn("fx1")
data.addColumn("fx2")
data.AddColumn("x")
data.AddColumn("fx1")
data.AddColumn("fx2")

for i := -5.0; i < 5; i += 0.1 {
data.addRow(i, 3*math.Sin(i)+3*i+30, i*i+5)
data.AddRow(i, 3*math.Sin(i)+3*i+30, i*i+5)
}

fmt.Println(chart.Draw(data))
Expand Down