December 2009 Commit Log

« Development Statistics for /Picasso/trunk

Commit Logs

December 2009
November 2009

Number of Commits:: 151
Number of Active Developers:: 6

Levi Throckmorton 2009-12-19 19:28 #151 Rev.: 157

multi-args done, doing Perlins and RGBToChrome stuff in ColorTests

87 lines of code changed in 3 files:

src/tests: ColorTests.java (new 44), EvaluatorTestsMultiArg.java (+33 -19), EvaluatorTestsUnary.java (+10 -1)

Levi Throckmorton 2009-12-19 17:32 #150 Rev.: 156

more multi-args

50 lines of code changed in 2 files:

src/tests: EvaluatorTestsMultiArg.java (+48 -4), EvaluatorTestsUnary.java (+2 -1)

Levi Throckmorton 2009-12-18 19:04 #149 Rev.: 155

first multi-arg test. It passed, hopefully it's correctly structured. More to come.

28 lines of code changed in 1 file:

src/tests: EvaluatorTestsMultiArg.java (+28 -2)

Levi Throckmorton 2009-12-18 18:09 #148 Rev.: 154

unary evaluator tests done

8 lines of code changed in 1 file:

src/tests: EvaluatorTestsUnary.java (+8 -8)

Levi Throckmorton 2009-12-18 17:09 #147 Rev.: 153

separated unary evaluators from multi-arg function evals in tests. MDF

224 lines of code changed in 4 files:

src/picasso/parser/language/expressions: Exponentiate.java (-3)
src/tests: EvaluatorTests.java (del), EvaluatorTestsMultiArg.java (new 30), EvaluatorTestsUnary.java (new 194)

Sam "The Sham" Reed 2009-12-18 14:14 #146 Rev.: 152

Added "Save Commands" feature.

Cleaned up some imports on RandomEvaluator.

57 lines of code changed in 4 files:

src/picasso/view: Frame.java (+2 -1), TextPanel.java (+14 -4)
src/picasso/view/commands: CommandSaver.java (new 41), RandomEvaluater.java (-9)

margoliesd 2009-12-18 14:07 #145 Rev.: 151

made clipHelper static since it does not rely on any instance variables

1 lines of code changed in 1 file:

src/picasso/parser/language/expressions: ImageClip.java (+1 -1)

Sam "The Sham" Reed 2009-12-18 13:53 #144 Rev.: 150

Fixed scrolling on textarea.

3 lines of code changed in 1 file:

src/picasso/view: TextPanel.java (+3 -3)

Sam "The Sham" Reed 2009-12-18 13:43 #143 Rev.: 149

Fixed Exponentiate - needed an abs

3 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Exponentiate.java (+3 -3)

Levi Throckmorton 2009-12-18 00:04 #142 Rev.: 148

test stuff

38 lines of code changed in 1 file:

src/tests: EvaluatorTests.java (+38 -4)

Levi Throckmorton 2009-12-17 20:37 #141 Rev.: 147

test stuff

3 lines of code changed in 2 files:

src/tests: ErrorParsedEvaluatedTests.java (+2 -2), EvaluatorTests.java (+1 -1)

Levi Throckmorton 2009-12-17 20:20 #140 Rev.: 146

added basic arithmetic tokenizer tests

71 lines of code changed in 2 files:

src/tests: TestOperationsProperties.java (-1), TokenizerTest.java (+71 -2)

Levi Throckmorton 2009-12-17 20:06 #139 Rev.: 145

finally solved my problems in EvaluatorTests. More to come!

56 lines of code changed in 2 files:

src/tests: EvaluatorTests.java (+54 -44), TokenizerTest.java (+2 -2)

margoliesd 2009-12-17 17:34 #138 Rev.: 144

now shows pop up if file does not exist

7 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Image.java (+7)

margoliesd 2009-12-17 17:22 #137 Rev.: 143

updated for mod and power

9 lines of code changed in 1 file:

src/picasso/parser: ExpressionTreeGenerator.java (+9 -7)

Stuart 2009-12-17 17:21 #136 Rev.: 142

fixed scientific num problem

5 lines of code changed in 1 file:

src/picasso/parser/language/expressions: RGBColor.java (+5 -1)

margoliesd 2009-12-17 17:03 #135 Rev.: 141

updated negate analyzer to use the word "negate" in the comments instead of "floor"

2 lines of code changed in 1 file:

src/picasso/parser: NegateAnalyzer.java (+2 -1)

margoliesd 2009-12-17 17:02 #134 Rev.: 140

updated image Wrap to use unscaled evaluate method

1 lines of code changed in 1 file:

src/picasso/parser/language/expressions: ImageWrap.java (+1 -1)

margoliesd 2009-12-17 16:59 #133 Rev.: 139

made size 800x800 to match with square -1 to 1

1 lines of code changed in 1 file:

src/picasso: Main.java (+1 -1)

margoliesd 2009-12-17 16:58 #132 Rev.: 138

removed unneeded import

0 lines of code changed in 1 file:

src/picasso/parser: StringAnalyzer.java (-1)

margoliesd 2009-12-17 16:57 #131 Rev.: 137

updated for negate

9 lines of code changed in 1 file:

src/picasso/parser: ExpressionTreeGenerator.java (+9 -4)

Stuart 2009-12-17 16:56 #130 Rev.: 136

fixed wrap

2 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Wrap.java (+2 -2)

margoliesd 2009-12-17 16:45 #129 Rev.: 135

image works better now

16 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Image.java (+16 -4)

Stuart 2009-12-17 16:35 #128 Rev.: 134

updated negate randexp

1 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Negate.java (+1 -1)

margoliesd 2009-12-17 14:53 #127 Rev.: 133

deleted picassoString working on imageClip

1 lines of code changed in 2 files:

src/picasso/parser/language/expressions: ImageClip.java (+1 -1), PicassoString.java (del)

margoliesd 2009-12-17 14:00 #126 Rev.: 132

deleted bang token b/c we are using negate token

0 lines of code changed in 1 file:

src/picasso/parser/tokens/chars: BangToken.java (del)

Stuart 2009-12-16 19:12 #125 Rev.: 131

still trying to fix conflicts

4 lines of code changed in 5 files:

src/picasso/extensions: RandomExpGenHelper.java (+1 -1)
src/picasso/parser: RandomColorAnalyzer.java (del), functions.conf (+3 -3)
src/picasso/parser/language/expressions: RandomColor.java (del)
src/picasso/parser/tokens/functions: RandomColorToken.java (del)

Stuart 2009-12-16 19:06 #124 Rev.: 130

fixing conflicts

15 lines of code changed in 3 files:

src/picasso/view: Frame.java (+1 -1), TextPanel.java (+7)
src/picasso/view/commands: RandomEvaluater.java (+7 -64)

Stuart 2009-12-16 19:04 #123

95 lines of code changed in 4 files:

src/picasso/parser: RandomAnalyzer.java (new 26)
src/picasso/parser/language/expressions: RGBColor.java (+12 -2), Random.java (new 43)
src/picasso/parser/tokens/functions: RandomToken.java (new 14)

margoliesd 2009-12-16 15:58 #122 Rev.: 125

image clip

56 lines of code changed in 1 file:

src/picasso/parser/language/expressions: ImageClip.java (new 56)

margoliesd 2009-12-16 15:58 #121 Rev.: 124

had to add a method to image for image clip to work

12 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Image.java (+12 -4)

margoliesd 2009-12-16 15:58 #120 Rev.: 123

added image clip to functions.conf

2 lines of code changed in 1 file:

src/picasso/parser: functions.conf (+2 -1)

margoliesd 2009-12-16 15:57 #119 Rev.: 122

analyzer for image clip

45 lines of code changed in 1 file:

src/picasso/parser: ImageClipAnalyzer.java (new 45)

margoliesd 2009-12-16 15:57 #118 Rev.: 121

token for image clip

15 lines of code changed in 1 file:

src/picasso/parser/tokens/functions: ImageClipToken.java (new 15)

Stuart 2009-12-16 15:36 #117 Rev.: 120

updated random expressions

3 lines of code changed in 2 files:

src/picasso/parser/language/expressions: RGBColor.java (+2 -34), RandomColor.java (+1 -1)

margoliesd 2009-12-16 14:52 #116 Rev.: 119

made image instance variable of type instance instead of expression tree node

2 lines of code changed in 1 file:

src/picasso/parser/language/expressions: ImageWrap.java (+2 -2)

Stuart 2009-12-15 22:41 #115 Rev.: 118

fixed exponentiate token problem. fixed randomColor problem

61 lines of code changed in 11 files:

src/picasso/extensions: RandomExpGen.java (+1 -1), RandomExpGenHelper.java (+1 -1)
src/picasso/parser: ExponentiateAnalyzer.java (+12 -9), functions.conf (+2 -1)
src/picasso/parser/language/expressions: Exponentiate.java (+1 -1), Negate.java (+1 -1), RGBColor.java (+27 -4), RandomColor.java (+1 -1)
src/picasso/parser/tokens: CharTokenFactory.java (+1 -1)
src/picasso/parser/tokens/functions: RandomColorToken.java (new 14)
src/picasso/parser/tokens/operations: PowerToken.java (del)

Stuart 2009-12-15 20:28 #114 Rev.: 117

random expressions are now generated. made a few changes with the gui as well, but was unsuccessful in adding a button for random.

499 lines of code changed in 31 files:

src/picasso/extensions: RandomExpGen.java (+34 -75), RandomExpGenHelper.java (+1 -1)
src/picasso/parser/language/expressions: Abs.java (+10), Atan.java (+11), Ceil.java (+10), Clamp.java (+10), Constant.java (+20 -4), Cos.java (+10), Divide.java (+17), Exp.java (+11), Exponentiate.java (+17), Floor.java (+11 -1), Log.java (+10), Minus.java (+17), Mod.java (+17), Multiply.java (+17), Negate.java (+10), PerlinBW.java (+17), PerlinColor.java (+17), Plus.java (+17), RGBColor.java (+17 -1), RandomColor.java (+37 -3), RgbToYCrCb.java (+10), Sin.java (+11 -1), Tan.java (+10), Wrap.java (+10), X.java (+5), Y.java (+5), YCrCbtoRGB.java (+10)
src/picasso/view: Frame.java (+3 -1)
src/picasso/view/commands: RandomEvaluater.java (new 97)

margoliesd 2009-12-14 00:16 #113 Rev.: 116

string analyzer now returns an image

2 lines of code changed in 1 file:

src/picasso/parser: StringAnalyzer.java (+2 -1)

margoliesd 2009-12-13 01:04 #112 Rev.: 115

made image wrap lowercase to match other functions

1 lines of code changed in 1 file:

src/picasso/parser: functions.conf (+1 -1)

margoliesd 2009-12-13 01:03 #111 Rev.: 114

commented out unneeded code

1 lines of code changed in 1 file:

src/picasso/parser/language/expressions: ImageWrap.java (+1 -1)

margoliesd 2009-12-13 01:01 #110 Rev.: 113

forgot to take out some print lines

0 lines of code changed in 1 file:

src/picasso/parser/language/expressions: ImageWrap.java (-2)

margoliesd 2009-12-13 00:33 #109 Rev.: 112

image wrap almost works. i made my own wrapper helper since the one in wrap didn't work for me and wrap looks like it works

21 lines of code changed in 1 file:

src/picasso/parser/language/expressions: ImageWrap.java (+21 -2)

Sara Sprenkle 2009-12-11 22:15 #108 Rev.: 111

Simplified RandomExpGen a bit.
- Made all (used) methods static because we don't need to create an object because the object doesn't need to "remember" anything.

8 lines of code changed in 1 file:

src/picasso/extensions: RandomExpGen.java (+8 -5)

Sara Sprenkle 2009-12-11 22:07 #107 Rev.: 110

Added code for using reflection to create ExpressionTreeNode classes for use in randomly generating expressions.

Wrote some example code for how to call ("invoke") static methods on those classes.

200 lines of code changed in 2 files:

src/picasso/extensions: RandomExpGen.java (+59 -72), RandomExpGenHelper.java (new 141)

Sara Sprenkle 2009-12-11 18:51 #106 Rev.: 109

Work in Progress: Trying to automatically gather the possible expressions using reflection (for use in automatically generating expressions)

Had to make some changes to class names in expressions package to make this work. The change in class names got propagated to the classes that use those classes.

Don't quite have this finished.

164 lines of code changed in 15 files:

src/picasso/parser: CosAnalyzer.java (+2 -2), OperationsPropertiesReader.java (new 31), SemanticAnalyzer.java (+5 -14), SinAnalyzer.java (+2 -2), YCrCbtoRGBAnalyzer.java (+2 -2), operations.prop (+2 -2)
src/picasso/parser/language/expressions: Cos.java (new 37), Cosine.java (del), Exp.java (+1 -1), Sin.java (new 37), Sine.java (del), YCRC2RGBR.java (del), YCrCbtoRGB.java (new 43)
src/picasso/parser/tokens/functions: CosToken.java (+1 -1), YCrCbtoRGBToken.java (+1 -1)

Sara Sprenkle 2009-12-11 18:49 #105 Rev.: 108

Work in progress: trying to automatically get the possible expressions, using reflection

139 lines of code changed in 1 file:

src/picasso/extensions: RandomExpGen.java (+139 -43)

Stuart 2009-12-11 13:55 #104 Rev.: 107

Started work on the random expression generator. Not Complete.

74 lines of code changed in 2 files:

.classpath (+7 -7)
src/picasso/extensions: RandomExpGen.java (new 67)

Levi Throckmorton 2009-12-11 09:36 #103 Rev.: 106

Added tan to functions.conf

4 lines of code changed in 2 files:

src/picasso/parser: functions.conf (+1)
src/tests: EvaluatorTests.java (+3 -2)

Levi Throckmorton 2009-12-11 09:21 #102 Rev.: 105

still testing things YAYAYAYAYAY HAPPY CHANUKAH

9 lines of code changed in 1 file:

src/tests: EvaluatorTests.java (+9 -3)

Levi Throckmorton 2009-12-11 05:14 #101 Rev.: 104

more fooling around in testing. Also, added an analyzer for Tan.

56 lines of code changed in 3 files:

src/picasso/parser: TanAnalyzer.java (new 24)
src/tests: EvaluatorTests.java (+25 -11), ParsedExpressionTreeTests.java (+7 -7)

margoliesd 2009-12-11 01:47 #100 Rev.: 103

added comments

2 lines of code changed in 1 file:

src/picasso/parser/language/expressions: ImageWrap.java (+2)

Stuart 2009-12-11 00:25 #99 Rev.: 102

fixed ycbrtorgb error

41 lines of code changed in 5 files:

src/picasso/parser: YCRC2RGBRAnalyzer.java (del), YCrCbtoRGBAnalyzer.java (new 25), functions.conf (+1 -1)
src/picasso/parser/tokens/functions: YCRC2RGBRToken.java (del), YCrCbtoRGBToken.java (new 15)

margoliesd 2009-12-10 22:26 #98 Rev.: 101

token for image wrap

15 lines of code changed in 1 file:

src/picasso/parser/tokens/functions: ImageWrapToken.java (new 15)

margoliesd 2009-12-10 22:25 #97 Rev.: 100

updated to include ImageWrap

2 lines of code changed in 1 file:

src/picasso/parser: functions.conf (+2 -1)

margoliesd 2009-12-10 22:25 #96 Rev.: 99

analyzer for image wrap

45 lines of code changed in 1 file:

src/picasso/parser: ImageWrapAnalyzer.java (new 45)

margoliesd 2009-12-10 22:25 #95 Rev.: 98

ImageWrap distorts the image instead of wrapping it, but i am committing it since it shouldn't break anyone else's code

45 lines of code changed in 1 file:

src/picasso/parser/language/expressions: ImageWrap.java (new 45)

Stuart 2009-12-10 17:47 #94 Rev.: 97

implemented the YCRC2RGBR and rgb conversion functions. they work.

197 lines of code changed in 9 files:

src/picasso/parser: RandomColorAnalyzer.java (new 26), RgbToYCrCbAnalyzer.java (new 25), YCRC2RGBRAnalyzer.java (new 25), functions.conf (+2)
src/picasso/parser/language/expressions: RgbToYCrCb.java (new 45), YCRC2RGBR.java (new 43)
src/picasso/parser/tokens/functions: RgbToYCrCbToken.java (new 15), YCRC2RGBRToken.java (new 15)
src/picasso/view/commands: Evaluater.java (+1 -1)

Stuart 2009-12-10 16:57 #93 Rev.: 96

update random color

3 lines of code changed in 1 file:

src/picasso/parser/language/expressions: RandomColor.java (+3 -6)

Sam "The Sham" Reed 2009-12-10 16:52 #92 Rev.: 95

Added metrics
Removed a TODO on DivideAnalyzer

Forgot to mention - changed frame's property of DISPOSE_ON_CLOSE to EXIT_ON_CLOSE. The program wasn't actually closing when we closed the window.

6 lines of code changed in 2 files:

.project (+6)
src/picasso/parser: DivideAnalyzer.java (-1)

Sam "The Sham" Reed 2009-12-10 16:42 #91 Rev.: 94

Huge commit:

Fixed order of operations on two-arg functions. There may be a few more that are messing this up, but I fixed divide, minus, and perlins. Any function that uses multiple args needs to be fixed - check DivideAnalyzer for details. Basically the parser is popping items off the queue in reverse order so we need to add them in reverse order.

Added Wrap, Exponentiate (^), Exp, and Negate (!).

Gave textentry box focus at startup and fixed order that items are added to textarea.

Removed Evaluate button.

206 lines of code changed in 19 files:

src/picasso/parser: DivideAnalyzer.java (+7 -4), ExpAnalyzer.java (new 26), ExponentiateAnalyzer.java (changed), MinusAnalyzer.java (+7 -4), PerlinBWAnalyzer.java (+7 -4), PerlinColorAnalyzer.java (+7 -4), WrapAnalyzer.java (new 26), functions.conf (+3), operations.prop (+3 -1)
src/picasso/parser/language/expressions: Exp.java (new 37), Exponentiate.java (changed), Log.java (+13 -3)
src/picasso/parser/tokens: CharTokenFactory.java (+1 -1)
src/picasso/parser/tokens/functions: ClampToken.java (new 15), ExpToken.java (new 15)
src/picasso/parser/tokens/operations: ExponentiateToken.java (new 16), NegateToken.java (new 16)
src/picasso/view: Frame.java (+4 -2), TextPanel.java (+3 -3)

Sam "The Sham" Reed 2009-12-10 15:24 #90 Rev.: 93

Fixed order of operations

3 lines of code changed in 1 file:

src/picasso/parser: ExpressionTreeGenerator.java (+3 -4)

Sam "The Sham" Reed 2009-12-10 15:04 #89 Rev.: 92

Added divide, minus, multiply
Fixed Log with abs - it doesn't just render half an image now when we use Log.

We still need a few more functions but try this out:
sin(log(atan(x) / log( [ 0.5969982517066919, 0.8007698879754397, 0.79637077865578 ] * atan(perlinColor(x, perlinColor(x, y))) + y)))

Nasty

163 lines of code changed in 8 files:

src/picasso/parser: DivideAnalyzer.java (new 33), MinusAnalyzer.java (new 33), MultiplyAnalyzer.java (new 33), operations.prop (+4 -1)
src/picasso/parser/language/expressions: Log.java (+3 -3), Minus.java (+14), Multiply.java (new 43), Times.java (del)

Sam "The Sham" Reed 2009-12-10 14:49 #88 Rev.: 91

Added popup error messages, only serious error messages, basically those not supposed to be seen by the user in the final product, will be displayed on the console. All parser errors are shown in a popup box.

13 lines of code changed in 2 files:

src/picasso/view: TextPanel.java (+2)
src/picasso/view/commands: Evaluater.java (+11)

margoliesd 2009-12-10 00:49 #87 Rev.: 90

changed PicassoString to Image since at this point it is closer to a picture than a string

82 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Image.java (new 82)

margoliesd 2009-12-10 00:36 #86 Rev.: 89

changed to use = for equals

1 lines of code changed in 1 file:

src/picasso/parser/language: CharConstants.java (+1 -1)

margoliesd 2009-12-10 00:35 #85 Rev.: 88

changed to use = sign for equals

1 lines of code changed in 1 file:

src/picasso/parser: operations.prop (+1 -1)

Sara Sprenkle 2009-12-09 22:23 #84 Rev.: 87

Typo!

1 lines of code changed in 1 file:

src/tests: TestOperationsProperties.java (+1 -1)

Sara Sprenkle 2009-12-09 22:22 #83 Rev.: 86

Created a test program to help with figuring out if we can use = for the assignment operator

32 lines of code changed in 1 file:

src/tests: TestOperationsProperties.java (new 32)

margoliesd 2009-12-09 20:43 #82 Rev.: 85

added test method testIdentifier to test identifier and equals token

21 lines of code changed in 1 file:

src/tests: TokenizerTest.java (+21)

margoliesd 2009-12-09 20:41 #81 Rev.: 84

added &=Equals to operations.prop

2 lines of code changed in 1 file:

src/picasso/parser: operations.prop (+2 -1)

margoliesd 2009-12-09 20:38 #80 Rev.: 83

removed unused imports in equals analyzer

0 lines of code changed in 1 file:

src/picasso/parser: EqualsAnalyzer.java (-4)

margoliesd 2009-12-09 20:37 #79 Rev.: 82

analyzes and equals token

45 lines of code changed in 1 file:

src/picasso/parser: EqualsAnalyzer.java (new 45)

margoliesd 2009-12-09 20:37 #78 Rev.: 81

updated expression tree generator to have an assignment constant and to check for equals token in order of operation

4 lines of code changed in 1 file:

src/picasso/parser: ExpressionTreeGenerator.java (+4 -3)

margoliesd 2009-12-09 20:35 #77 Rev.: 80

updated char token factory to use EQUALS constant (instead of EQUAL)

1 lines of code changed in 1 file:

src/picasso/parser/tokens: CharTokenFactory.java (+1 -1)

margoliesd 2009-12-09 20:35 #76 Rev.: 79

updated equals token to use EQUALS constant

2 lines of code changed in 1 file:

src/picasso/parser/tokens/operations: EqualsToken.java (+2 -2)

margoliesd 2009-12-09 20:34 #75 Rev.: 78

updated variable to contain an expression tree node

4 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Variable.java (+4 -3)

margoliesd 2009-12-09 20:33 #74 Rev.: 77

had to change equals to & because java reserves = in prop file

1 lines of code changed in 1 file:

src/picasso/parser/language: CharConstants.java (+1 -1)

Sam "The Sham" Reed 2009-12-09 16:49 #73 Rev.: 76

Fixed the addition section of ParsedExpressionTreeTests.

Apparently it builds the tree from the list backwards, so I first changed the order of the list. This gave me a weird error about two very equal things not being equal. Sprenkle told me that it was because Plus didn't have an equals() method - so I added one to the Plus class and all's well.

17 lines of code changed in 2 files:

src/picasso/parser/language/expressions: Plus.java (+14)
src/tests: ParsedExpressionTreeTests.java (+3 -3)

Sam "The Sham" Reed 2009-12-09 16:39 #72 Rev.: 75

Added up/down keypress history functionality to the textEntry box. Try it. It's awesome.

51 lines of code changed in 1 file:

src/picasso/view: TextPanel.java (+51 -3)

margoliesd 2009-12-09 15:41 #71 Rev.: 74

removed and added comments

1 lines of code changed in 1 file:

src/picasso/parser/tokens: TokenFactory.java (+1 -2)

Levi Throckmorton 2009-12-09 15:29 #70 Rev.: 73

see previous comment

14 lines of code changed in 1 file:

src/tests: ParsedExpressionTreeTests.java (+14 -1)

Levi Throckmorton 2009-12-09 15:01 #69 Rev.: 72

can somebody please run ParsedExpressionTreeTests and tell me what the hell is wrong

10 lines of code changed in 2 files:

src/tests: EvaluatorTests.java (-2), ParsedExpressionTreeTests.java (+10 -13)

Sam "The Sham" Reed 2009-12-09 12:12 #68 Rev.: 71

1 lines of code changed in 1 file:

src/picasso/parser: operations.prop (+1)

Levi Throckmorton 2009-12-09 12:04 #67 Rev.: 70

test package

225 lines of code changed in 5 files:

ParsedExpressionTreeTests.java.mine (new 70), ParsedExpressionTreeTests.java.r30 (new 70), ParsedExpressionTreeTests.java.r58 (new 68)
src/tests: ParsedExpressionTreeTests.java (+12 -5), TokenizerTest.java (+5)

Sam "The Sham" Reed 2009-12-09 12:01 #66 Rev.: 69

Fixed multiarg analyzers - see plus, PerlinBW, etc. Plus works! Removed some items from functions.conf that weren't working yet.

43 lines of code changed in 10 files:

src/picasso/parser: AbsAnalyzer.java (+1 -1), AtanAnalyzer.java (+1 -1), CeilAnalyzer.java (+1 -1), ClampAnalyzer.java (+1 -1), ExponentiateAnalyzer.java (+9 -3), ModAnalyzer.java (+9 -3), NegateAnalyzer.java (+1 -1), PerlinBWAnalyzer.java (+10 -4), PerlinColorAnalyzer.java (+10 -4), functions.conf (-2)

Sam "The Sham" Reed 2009-12-09 11:52 #65 Rev.: 68

Deleted some functions that weren't implemented yet

0 lines of code changed in 1 file:

src/picasso/parser: functions.conf (-6)

Sam "The Sham" Reed 2009-12-09 11:51 #64 Rev.: 67

Fixed spelling error on "ceil"

1 lines of code changed in 1 file:

src/picasso/parser: functions.conf (+1 -1)

Stuart 2009-12-09 11:45 #63 Rev.: 66

update multiarg expressions

58 lines of code changed in 8 files:

src/picasso/parser: PerlinBWAnalyzer.java (new 26), PerlinColorAnalyzer.java (new 26)
src/picasso/parser/language/expressions: Divide.java (+1 -1), Exponentiate.java (+1 -1), Minus.java (+1 -1), Mod.java (+1 -1), Plus.java (+1 -1), Times.java (+1 -1)

Sam "The Sham" Reed 2009-12-09 11:44 #62 Rev.: 65

Updated PlusAnalyzer

9 lines of code changed in 1 file:

src/picasso/parser: PlusAnalyzer.java (+9 -1)

margoliesd 2009-12-09 11:43 #61 Rev.: 64

string

86 lines of code changed in 1 file:

src/picasso/parser/tokens: StringToken.java (+86 -86)

Sam "The Sham" Reed 2009-12-09 11:33 #60 Rev.: 63

Added Analyzers A-N, updated functions.conf

196 lines of code changed in 8 files:

src/picasso/parser: AbsAnalyzer.java (new 26), AtanAnalyzer.java (new 26), CeilAnalyzer.java (new 26), ClampAnalyzer.java (new 26), ExponentiateAnalyzer.java (new 26), ModAnalyzer.java (new 26), NegateAnalyzer.java (new 26), functions.conf (+14 -1)

Levi Throckmorton 2009-12-09 11:30 #59 Rev.: 62

added Perlin Tokens and removed comment in test package

32 lines of code changed in 3 files:

src/picasso/parser/tokens/functions: PerlinBWToken.java (new 15), PerlinColorToken.java (new 15)
src/tests: TokenizerTest.java (+2 -2)

margoliesd 2009-12-09 11:21 #58 Rev.: 61

string

1 lines of code changed in 1 file:

src/picasso/parser: ExpressionTreeGenerator.java (+1 -1)

margoliesd 2009-12-09 11:21 #57 Rev.: 60

string

31 lines of code changed in 1 file:

src/picasso/parser: StringAnalyzer.java (+31 -28)

Sam "The Sham" Reed 2009-12-09 11:20 #56 Rev.: 59

Added LogAnalyzer - we need to update functions.conf and add simple Analyzers to finish all the functions.

28 lines of code changed in 2 files:

src/picasso/parser: LogAnalyzer.java (new 26), functions.conf (+2 -1)

Sara Sprenkle 2009-12-09 08:40 #55 Rev.: 58

Changed comment about what is getting popped off the stack.

1 lines of code changed in 1 file:

src/picasso/parser: PlusAnalyzer.java (+1 -1)

Levi Throckmorton 2009-12-09 03:08 #54 Rev.: 57

created skeleton functions in test packages

45 lines of code changed in 1 file:

src/tests: EvaluatorTests.java (+45 -4)

Stuart 2009-12-09 02:44 #53 Rev.: 56

added negate

41 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Negate.java (new 41)

Stuart 2009-12-09 02:18 #52 Rev.: 55

finished up the binary operators. note that I ended up making them a subclass of MultiArgFunction class. This is a change from before.

215 lines of code changed in 5 files:

src/picasso/parser/language/expressions: Divide.java (new 43), Exponentiate.java (new 43), Minus.java (new 43), Mod.java (new 43), Times.java (new 43)

Levi Throckmorton 2009-12-09 01:06 #51 Rev.: 54

more work in test package

0 lines of code changed in 2 files:

src/tests: ErrorParsedEvaluatedTests.java (-2), ParsedExpressionTreeTests.java (-1)

Levi Throckmorton 2009-12-08 23:44 #50 Rev.: 53

got rid of the red x that was plaguing ParsedExpressionTreeTests. Will fix later on this evening/tomorrow morning.

6 lines of code changed in 1 file:

src/tests: ParsedExpressionTreeTests.java (+6 -7)

Stuart 2009-12-08 22:56 #49 Rev.: 52

figured out how to set up the Plus expression....I think.

9 lines of code changed in 2 files:

src/picasso/parser/language/expressions: BinaryOperator.java (del), Plus.java (+9 -8)

Stuart 2009-12-08 20:49 #48 Rev.: 51

working on binaryoperators. not finished.

73 lines of code changed in 2 files:

src/picasso/parser/language/expressions: BinaryOperator.java (new 31), Plus.java (new 42)

Stuart 2009-12-08 19:46 #47 Rev.: 50

fixed the perlins and added random

4 lines of code changed in 2 files:

src/picasso/parser/language/expressions: PerlinBW.java (+2 -2), PerlinColor.java (+2 -2)

Levi Throckmorton 2009-12-08 19:11 #46 Rev.: 49

Fixed Stuart's param1 and param2 variables. Since they were in the constructor, they were considered local and weren't recognized in the other method.

10 lines of code changed in 2 files:

src/picasso/parser/language/expressions: PerlinBW.java (+5 -2), PerlinColor.java (+5 -2)

Levi Throckmorton 2009-12-08 19:08 #45 Rev.: 48

edited author comment in WrapToken

2 lines of code changed in 1 file:

src/picasso/parser/tokens/functions: WrapToken.java (+2 -2)

Stuart 2009-12-08 18:47 #44 Rev.: 47

more work on multi-arg functions

122 lines of code changed in 3 files:

src/picasso/parser/language/expressions: MultiArgFunction.java (new 32), PerlinBW.java (new 48), RandomColor.java (new 42)

Stuart 2009-12-08 18:23 #43 Rev.: 46

HELP! I can't figure out why it's not recognizing my param1 and param2 variables. This class works just like cosine and they are set up pretty much the same way. Can someone take a look and see if they see what I'm doing wrong?

48 lines of code changed in 1 file:

src/picasso/parser/language/expressions: PerlinColor.java (new 48)

margoliesd 2009-12-08 14:06 #42 Rev.: 45

token for Wrap class

15 lines of code changed in 1 file:

src/picasso/parser/tokens/functions: WrapToken.java (new 15)

Levi Throckmorton 2009-12-08 09:40 #41 Rev.: 44

changed "Addition" to "Plus" in ParsedExpressionTreeTests

5 lines of code changed in 1 file:

src/tests: ParsedExpressionTreeTests.java (+5 -5)

margoliesd 2009-12-07 23:03 #40 Rev.: 43

updated for String

13 lines of code changed in 1 file:

src/picasso/parser/tokens: TokenFactory.java (+13 -4)

margoliesd 2009-12-07 21:52 #39

updated for String

7 lines of code changed in 2 files:

src/picasso/parser: ExpressionTreeGenerator.java (+2), SemanticAnalyzer.java (+5)

margoliesd 2009-12-07 19:29 #38 Rev.: 40

updated list to include more constants from CharConstants

15 lines of code changed in 1 file:

src/picasso/parser/tokens: CharTokenFactory.java (+15 -1)

Levi Throckmorton 2009-12-07 19:07 #37 Rev.: 39

more yellow triangle cleaning (SemanticAnalyzer)

3 lines of code changed in 1 file:

src/picasso/parser: SemanticAnalyzer.java (+3)

Levi Throckmorton 2009-12-07 19:03 #36 Rev.: 38

Got rid of a yellow triangle in TokenFactory. I don't like yellow triangles.

1 lines of code changed in 1 file:

src/picasso/parser/tokens: TokenFactory.java (+1)

margoliesd 2009-12-07 19:01 #35 Rev.: 37

analyzer for string

28 lines of code changed in 1 file:

src/picasso/parser: StringAnalyzer.java (new 28)

margoliesd 2009-12-07 19:00 #34 Rev.: 36

token for String

86 lines of code changed in 1 file:

src/picasso/parser/tokens: StringToken.java (new 86)

Sam "The Sham" Reed 2009-12-07 15:54 #33 Rev.: 35

Added comments and cleaned up a few files in the GUI.

10 lines of code changed in 3 files:

src/picasso/view: Frame.java (-1), TextPanel.java (+8 -9)
src/picasso/view/commands: Evaluater.java (+2 -12)

Sam "The Sham" Reed 2009-12-07 15:49 #32 Rev.: 34

Fixed TextPanel to render an image on a carriage return.

28 lines of code changed in 2 files:

src/picasso/view: Frame.java (+8 -2), TextPanel.java (+20 -5)

Sam "The Sham" Reed 2009-12-07 15:32 #31 Rev.: 33

Some things didn't get updated

58 lines of code changed in 6 files:

src/picasso/parser: CosAnalyzer.java (new 26), functions.conf (+2 -1)
src/picasso/parser/tokens/functions: CosToken.java (new 15), CosineToken.java (del)
src/picasso/view: Frame.java (+4 -4), TextPanel.java (+11)

Sam "The Sham" Reed 2009-12-07 12:13 #30 Rev.: 32

Evaluater timestamp

19 lines of code changed in 1 file:

src/picasso/view/commands: Evaluater.java (+19 -2)

Stuart 2009-12-07 12:09 #29 Rev.: 31

updated wrap

8 lines of code changed in 2 files:

src/picasso/parser/language/expressions: Wrap.java (+7 -3)
src/picasso/view/commands: Evaluater.java (+1 -1)

Levi Throckmorton 2009-12-07 12:01 #28 Rev.: 30

Created all tokens for all constants in CharConstants.java

96 lines of code changed in 7 files:

src/picasso/parser/tokens/chars: ApostropheToken.java (new 16), BackslashToken.java (new 16), BangToken.java (new), DollarSignToken.java (new 16), QuestionMarkToken.java (new 16), TildeToken.java (new 16), UnderscoreToken.java (new 16)

Levi Throckmorton 2009-12-07 11:52 #27 Rev.: 29

also, AbsToken

15 lines of code changed in 1 file:

src/picasso/parser/tokens/functions: AbsToken.java (new 15)

Levi Throckmorton 2009-12-07 11:49 #26 Rev.: 28

created TanToken, AtanToken, CeilToken

29 lines of code changed in 2 files:

src/picasso/parser/tokens/functions: AtanToken.java (new 14), CeilToken.java (new 15)

Levi Throckmorton 2009-12-07 11:46 #25 Rev.: 27

Created QuoteToken and LogToken

43 lines of code changed in 3 files:

src/picasso/parser/tokens/chars: QuoteToken.java (new 15)
src/picasso/parser/tokens/functions: LogToken.java (new 14), TanToken.java (new 14)

Sam "The Sham" Reed 2009-12-07 11:42 #24 Rev.: 26

Added a TextEntry and TextArea box to the GUI. Entries don't do anything now but show up in the TextArea - I have yet to make the entries be evaluated as an image.

Also fixed an unused import in Evaluater.

58 lines of code changed in 3 files:

src/picasso/view: Frame.java (+5), TextPanel.java (new 53)
src/picasso/view/commands: Evaluater.java (-1)

Levi Throckmorton 2009-12-07 11:32 #23 Rev.: 25

i don't know what i did

1 lines of code changed in 1 file:

src/picasso/parser/tokens: TokenFactory.java (+1 -1)

Levi Throckmorton 2009-12-07 03:47 #22 Rev.: 24

played around with sine and cosine tests, something not quite right

6 lines of code changed in 1 file:

src/tests: EvaluatorTests.java (+6 -4)

Levi Throckmorton 2009-12-07 03:11 #21 Rev.: 23

removed auto-generated method stub notifications

1 lines of code changed in 2 files:

src/picasso/parser/language/expressions: Variable.java (+1 -2), Y.java (-1)

Levi Throckmorton 2009-12-07 03:00 #20 Rev.: 22

added a bunch of operation tokens as well as PeriodToken. Also, moved EqualsToken to operations package.

113 lines of code changed in 8 files:

src/picasso/parser/tokens/chars: EqualsToken.java (del), PeriodToken.java (new 18)
src/picasso/parser/tokens/operations: DivideToken.java (new 16), EqualsToken.java (new 15), MinusToken.java (new 16), ModToken.java (new 16), MultiplyToken.java (new 16), PowerToken.java (new 16)

Stuart 2009-12-07 02:16 #19 Rev.: 21

finished up a few more unary expressions

111 lines of code changed in 3 files:

src/picasso/parser/language/expressions: Atan.java (new 37), Log.java (new 37), Tan.java (new 37)

Stuart 2009-12-07 02:11 #18 Rev.: 20

completed wrap expression

12 lines of code changed in 1 file:

src/picasso/parser/language/expressions: Wrap.java (+12 -5)

Stuart 2009-12-07 01:56 #17 Rev.: 19

150 lines of code changed in 4 files:

src/picasso/parser/language/expressions: Abs.java (new 41), Ceil.java (new 41), Clamp.java (new 38), Wrap.java (new 30)

Levi Throckmorton 2009-12-07 01:51 #16 Rev.: 18

added code to testTokenizeCombinedFunctionExpression

18 lines of code changed in 1 file:

src/tests: TokenizerTest.java (+18 -3)

Levi Throckmorton 2009-12-07 01:41 #15 Rev.: 17

added testCosine and testSine to EvaluatorTests

21 lines of code changed in 1 file:

src/tests: EvaluatorTests.java (+21 -1)

Levi Throckmorton 2009-12-07 01:25 #14 Rev.: 16

added tearDown functions to JUnit test cases

5 lines of code changed in 4 files:

src/tests: ErrorParsedEvaluatedTests.java (+1), EvaluatorTests.java (+1 -3), ParsedExpressionTreeTests.java (+2), TokenizerTest.java (+1)

Levi Throckmorton 2009-12-06 23:54 #13 Rev.: 15

added CosineToken in picasso.parser.token.functions

16 lines of code changed in 2 files:

src/picasso/parser/tokens/functions: CosineToken.java (new 15), SinToken.java (+1 -1)

margoliesd 2009-12-06 22:44 #12 Rev.: 14

more work trying to get input image to scale correctly

82 lines of code changed in 1 file:

src/picasso/parser/language/expressions: PicassoString.java (new 82)

Stuart 2009-12-03 16:14 #11 Rev.: 13

added cosine

42 lines of code changed in 2 files:

src/picasso/parser/language/expressions: Cosine.java (new 37)
src/picasso/view/commands: Evaluater.java (+5 -3)

Stuart 2009-12-03 15:25 #10 Rev.: 12

0 lines of code changed in 1 file:

src/picasso: testfile (del)

Sara Sprenkle 2009-12-03 15:24 #9 Rev.: 11

Testing update

2 lines of code changed in 1 file:

src/picasso: testfile (+2 -1)

Stuart 2009-12-03 15:23 #8 Rev.: 10

test commit

1 lines of code changed in 1 file:

src/picasso: testfile (new 1)

Levi Throckmorton 2009-12-02 12:11 #7 Rev.: 9

added test case for y-evaluation

9 lines of code changed in 1 file:

src/tests: EvaluatorTests.java (+9 -1)

Levi Throckmorton 2009-12-02 11:41 #6 Rev.: 8

deleted some files or something

0 lines of code changed in 2 files:

DavidMargolies (del), YourName (del)

Levi Throckmorton 2009-12-02 11:40 #5 Rev.: 6

3 lines of code changed in 2 files:

DavidMargolies (+2 -1)
.settings: org.eclipse.jdt.core.prefs (+1 -1)

margoliesd 2009-12-02 11:39 #4 Rev.: 5

1 lines of code changed in 1 file:

DavidMargolies (new 1)

reeds 2009-12-02 11:37 #3

2 lines of code changed in 2 files:

YourName (+2 -1)
src/picasso: Snarf (del)

reeds 2009-12-02 11:36 #2 Rev.: 3

Added extra awesome

36 lines of code changed in 4 files:

.classpath (new 7), .project (new 17)
.settings: org.eclipse.jdt.core.prefs (new 12)
src/picasso: Snarf (new)

Levi Throckmorton 2009-12-02 11:36 #1 Rev.: 2

Created a file with foolish text

1 lines of code changed in 1 file:

YourName (new 1)

November 2009 »

Generated by StatSVN 0.4.1