From 04bf23724029ccea533d1b96c0a4727cc1651196 Mon Sep 17 00:00:00 2001 From: apierro Date: Mon, 25 Mar 2019 16:43:52 +0100 Subject: [PATCH 1/4] Added MiroValue, MiroPoint and MiroListOfPoints classes. --- src/Miro/MiroListOfPoints.class.st | 8 ++++++++ src/Miro/MiroPoint.class.st | 18 ++++++++++++++++++ src/Miro/MiroValue.class.st | 28 ++++++++++++++++++++++++++++ src/MiroTest/MiroValueTest.class.st | 25 +++++++++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 src/Miro/MiroListOfPoints.class.st create mode 100644 src/Miro/MiroPoint.class.st create mode 100644 src/Miro/MiroValue.class.st create mode 100644 src/MiroTest/MiroValueTest.class.st diff --git a/src/Miro/MiroListOfPoints.class.st b/src/Miro/MiroListOfPoints.class.st new file mode 100644 index 0000000..c4d4445 --- /dev/null +++ b/src/Miro/MiroListOfPoints.class.st @@ -0,0 +1,8 @@ +Class { + #name : #MiroListOfPoints, + #superclass : #Object, + #instVars : [ + 'points' + ], + #category : #'Miro-Data' +} diff --git a/src/Miro/MiroPoint.class.st b/src/Miro/MiroPoint.class.st new file mode 100644 index 0000000..b766b91 --- /dev/null +++ b/src/Miro/MiroPoint.class.st @@ -0,0 +1,18 @@ +Class { + #name : #MiroPoint, + #superclass : #Object, + #instVars : [ + 'values' + ], + #category : #'Miro-Data' +} + +{ #category : #accessing } +MiroPoint >> values [ + ^ values +] + +{ #category : #accessing } +MiroPoint >> values: anObject [ + values := anObject +] diff --git a/src/Miro/MiroValue.class.st b/src/Miro/MiroValue.class.st new file mode 100644 index 0000000..a8b2a2a --- /dev/null +++ b/src/Miro/MiroValue.class.st @@ -0,0 +1,28 @@ +Class { + #name : #MiroValue, + #superclass : #Object, + #instVars : [ + 'value' + ], + #category : #'Miro-Data' +} + +{ #category : #testing } +MiroValue >> isLabel [ + ^ (self value isNumber) not +] + +{ #category : #testing } +MiroValue >> isNumber [ + ^ self value isNumber +] + +{ #category : #accessing } +MiroValue >> value [ + ^ value +] + +{ #category : #accessing } +MiroValue >> value: anObject [ + value := anObject +] diff --git a/src/MiroTest/MiroValueTest.class.st b/src/MiroTest/MiroValueTest.class.st new file mode 100644 index 0000000..b2adc1b --- /dev/null +++ b/src/MiroTest/MiroValueTest.class.st @@ -0,0 +1,25 @@ +Class { + #name : #MiroValueTest, + #superclass : #TestCase, + #category : #'MiroTest-Data' +} + +{ #category : #testing } +MiroValueTest >> testIsLabel [ + "comment stating purpose of message" + |mv| + mv := MiroValue new. + mv value: 'lkjkl'. + self assert: (mv value) isLabel equals: true. +] + +{ #category : #testing } +MiroValueTest >> testIsNumber [ + "comment stating purpose of message" + |mv| + mv := MiroValue new. + mv value: 'label'. + self assert: mv value isNumber equals: false. + mv value: 12. + self assert: mv value isNumber equals: true +] From 561827bcb8bf4de7ad48773a0df7d92c21846918 Mon Sep 17 00:00:00 2001 From: apierro Date: Tue, 26 Mar 2019 16:19:02 +0100 Subject: [PATCH 2/4] Added dimension and initialize methods to MiroPoint class. --- src/Miro/MiroData.class.st | 5 +++++ src/Miro/MiroListOfPoints.class.st | 2 +- src/Miro/MiroListOfSingleValues.class.st | 2 +- src/Miro/MiroPoint.class.st | 15 ++++++++++++++- src/Miro/MiroValue.class.st | 2 +- src/MiroTest/MiroPointTest.class.st | 20 ++++++++++++++++++++ 6 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 src/Miro/MiroData.class.st create mode 100644 src/MiroTest/MiroPointTest.class.st diff --git a/src/Miro/MiroData.class.st b/src/Miro/MiroData.class.st new file mode 100644 index 0000000..4d054df --- /dev/null +++ b/src/Miro/MiroData.class.st @@ -0,0 +1,5 @@ +Class { + #name : #MiroData, + #superclass : #Object, + #category : #'Miro-Data' +} diff --git a/src/Miro/MiroListOfPoints.class.st b/src/Miro/MiroListOfPoints.class.st index c4d4445..d6cedfb 100644 --- a/src/Miro/MiroListOfPoints.class.st +++ b/src/Miro/MiroListOfPoints.class.st @@ -1,6 +1,6 @@ Class { #name : #MiroListOfPoints, - #superclass : #Object, + #superclass : #MiroData, #instVars : [ 'points' ], diff --git a/src/Miro/MiroListOfSingleValues.class.st b/src/Miro/MiroListOfSingleValues.class.st index acb8bb3..e7f3d9a 100644 --- a/src/Miro/MiroListOfSingleValues.class.st +++ b/src/Miro/MiroListOfSingleValues.class.st @@ -1,6 +1,6 @@ Class { #name : #MiroListOfSingleValues, - #superclass : #Object, + #superclass : #MiroData, #instVars : [ 'data', 'labels' diff --git a/src/Miro/MiroPoint.class.st b/src/Miro/MiroPoint.class.st index b766b91..59be990 100644 --- a/src/Miro/MiroPoint.class.st +++ b/src/Miro/MiroPoint.class.st @@ -1,12 +1,25 @@ Class { #name : #MiroPoint, - #superclass : #Object, + #superclass : #MiroData, #instVars : [ 'values' ], #category : #'Miro-Data' } +{ #category : #accessing } +MiroPoint >> dimension [ + "Dimension of a point" + ^ values size +] + +{ #category : #initialization } +MiroPoint >> initialize [ + super initialize . + values := OrderedCollection new + +] + { #category : #accessing } MiroPoint >> values [ ^ values diff --git a/src/Miro/MiroValue.class.st b/src/Miro/MiroValue.class.st index a8b2a2a..9aa67cf 100644 --- a/src/Miro/MiroValue.class.st +++ b/src/Miro/MiroValue.class.st @@ -1,6 +1,6 @@ Class { #name : #MiroValue, - #superclass : #Object, + #superclass : #MiroData, #instVars : [ 'value' ], diff --git a/src/MiroTest/MiroPointTest.class.st b/src/MiroTest/MiroPointTest.class.st new file mode 100644 index 0000000..8cbdf54 --- /dev/null +++ b/src/MiroTest/MiroPointTest.class.st @@ -0,0 +1,20 @@ +Class { + #name : #MiroPointTest, + #superclass : #TestCase, + #category : #'MiroTest-Data' +} + +{ #category : #tests } +MiroPointTest >> testDimension [ + "comment stating purpose of message" + |mp| + mp := MiroPoint new. + self assert: mp dimension equals: 0 +] + +{ #category : #test } +MiroPointTest >> testValues [ + + self flag: #toImplement. + self assert: false +] From e3d8f82e502c4b9731a5d5cc24d085c417f9bd8e Mon Sep 17 00:00:00 2001 From: apierro Date: Tue, 26 Mar 2019 18:25:58 +0100 Subject: [PATCH 3/4] Fixed the testIsLabel method. --- src/Miro/MiroPoint.class.st | 7 +++++++ src/Miro/MiroValue.class.st | 7 +++++++ src/MiroTest/MiroPointTest.class.st | 4 +++- src/MiroTest/MiroValueTest.class.st | 12 ++++++++++-- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/Miro/MiroPoint.class.st b/src/Miro/MiroPoint.class.st index 59be990..143804c 100644 --- a/src/Miro/MiroPoint.class.st +++ b/src/Miro/MiroPoint.class.st @@ -7,6 +7,13 @@ Class { #category : #'Miro-Data' } +{ #category : #initialization } +MiroPoint >> addValue: aMiroValue [ + values add: aMiroValue. + ^aMiroValue + +] + { #category : #accessing } MiroPoint >> dimension [ "Dimension of a point" diff --git a/src/Miro/MiroValue.class.st b/src/Miro/MiroValue.class.st index 9aa67cf..0fd3651 100644 --- a/src/Miro/MiroValue.class.st +++ b/src/Miro/MiroValue.class.st @@ -7,6 +7,13 @@ Class { #category : #'Miro-Data' } +{ #category : #accessing } +MiroValue class >> value: aMiroValue [ + ^ self new value: aMiroValue; + yourself + +] + { #category : #testing } MiroValue >> isLabel [ ^ (self value isNumber) not diff --git a/src/MiroTest/MiroPointTest.class.st b/src/MiroTest/MiroPointTest.class.st index 8cbdf54..c8985e2 100644 --- a/src/MiroTest/MiroPointTest.class.st +++ b/src/MiroTest/MiroPointTest.class.st @@ -9,7 +9,9 @@ MiroPointTest >> testDimension [ "comment stating purpose of message" |mp| mp := MiroPoint new. - self assert: mp dimension equals: 0 + self assert: mp dimension equals: 0. + mp addValue: MiroValue new. + self assert: mp dimension equals: 1. ] { #category : #test } diff --git a/src/MiroTest/MiroValueTest.class.st b/src/MiroTest/MiroValueTest.class.st index b2adc1b..396c7fe 100644 --- a/src/MiroTest/MiroValueTest.class.st +++ b/src/MiroTest/MiroValueTest.class.st @@ -9,8 +9,8 @@ MiroValueTest >> testIsLabel [ "comment stating purpose of message" |mv| mv := MiroValue new. - mv value: 'lkjkl'. - self assert: (mv value) isLabel equals: true. + mv value: 'lab1'. + self assert: mv isLabel equals: true. ] { #category : #testing } @@ -23,3 +23,11 @@ MiroValueTest >> testIsNumber [ mv value: 12. self assert: mv value isNumber equals: true ] + +{ #category : #test } +MiroValueTest >> testValue [ + |mv| + mv := MiroValue new. + mv value: 'label'. + self assert: mv value equals: 'label' +] From a795d1c45883db0532cdf41f5f88923297f9b4c9 Mon Sep 17 00:00:00 2001 From: apierro Date: Wed, 27 Mar 2019 15:02:36 +0100 Subject: [PATCH 4/4] Rename variable --- src/Miro/GridGraphList.class.st | 2 +- src/Miro/MiroPoint.class.st | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Miro/GridGraphList.class.st b/src/Miro/GridGraphList.class.st index fd0bc3b..7e38828 100644 --- a/src/Miro/GridGraphList.class.st +++ b/src/Miro/GridGraphList.class.st @@ -73,6 +73,6 @@ GridGraphList >> renderObjectOn: html graph: aGraphId [ | miroPlot | miroPlot := (MiroPlot allReportKinds detect: [ :report | report displayName = aGraphId ]) new. - miroPlot useRoassal. + miroPlot useChartJS. html render: miroPlot ] diff --git a/src/Miro/MiroPoint.class.st b/src/Miro/MiroPoint.class.st index 143804c..eec8d95 100644 --- a/src/Miro/MiroPoint.class.st +++ b/src/Miro/MiroPoint.class.st @@ -33,6 +33,6 @@ MiroPoint >> values [ ] { #category : #accessing } -MiroPoint >> values: anObject [ - values := anObject +MiroPoint >> values: aCollection [ + values := aCollection ]