[Mathlib-commitlog] mathlib/Source/MathLib/Functions/Trigonometric GradToDeg.java, 1.4, 1.5 RadToGrad.java, 1.4, 1.5 DegToRad.java, 1.4, 1.5 GradToRad.java, 1.4, 1.5 DegToGrad.java, 1.4, 1.5 RadToDeg.java, 1.4, 1.5

[Stefan M. <st_...@us...>]

Update of /cvsroot/mathlib/mathlib/Source/MathLib/Functions/Trigonometric
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19983/Source/MathLib/Functions/Trigonometric

Modified Files:
	GradToDeg.java RadToGrad.java DegToRad.java GradToRad.java 
	DegToGrad.java RadToDeg.java 
Log Message:
converted evaluation to ExternalElementWiseFunction

Index: DegToRad.java
===================================================================
RCS file: /cvsroot/mathlib/mathlib/Source/MathLib/Functions/Trigonometric/DegToRad.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DegToRad.java	26 Dec 2006 12:26:39 -0000	1.4
--- DegToRad.java	10 Jan 2007 18:48:59 -0000	1.5
***************
*** 1,37 ****
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Tokens.NumberToken;
! import MathLib.Tokens.Token;
! import MathLib.Tokens.OperandToken;
! import MathLib.Functions.ExternalFunction;
  
! public class DegToRad extends ExternalFunction
  {
! 	/**converts value from degrees to radians
! 	if the parameter is a matrix then all elements get converted
! 	@param operads[0] = value to convert
! 	@return the converted value*/
! 	public OperandToken evaluate(Token[] operands)
! 	{
! 		OperandToken result = new NumberToken(0);
! 		if(operands[0] != null && operands[0] instanceof NumberToken)
! 		{
! 			NumberToken value = ((NumberToken)operands[0]);
! 			double[][] values = value.getReValues();
! 			int sizeY = value.getSizeY();
! 			int sizeX = value.getSizeX();
! 			double[][] results = new double[sizeY][sizeX];
! 			
! 			for(int yy = 0; yy < sizeY; yy++)
! 			{
! 				for(int xx = 0; xx < sizeX; xx++)
! 				{
! 					results[yy][xx] = values[yy][xx] * Math.PI / 180;
! 				}				
! 			}
! 			result = new NumberToken(results);
! 		}
! 		return result;
! 	}
  
  }
--- 1,25 ----
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Functions.ExternalElementWiseFunction;
  
! public class DegToRad extends ExternalElementWiseFunction
  {
!     
!     public DegToRad()
!     {
!         name = "DegToRad";
!     }
!     
!     /**converts value from degrees to radians
!     @param operads[0] = value to convert
!     @return the converted value*/
!     public double[] evaluateValue(double[] arg)
!     {
!         double[] result = new double[2];
!         
!         result[REAL] = arg[REAL] * Math.PI / 180;
!         
!         return result;
!     }
  
  }

Index: GradToDeg.java
===================================================================
RCS file: /cvsroot/mathlib/mathlib/Source/MathLib/Functions/Trigonometric/GradToDeg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GradToDeg.java	26 Dec 2006 12:26:38 -0000	1.4
--- GradToDeg.java	10 Jan 2007 18:48:59 -0000	1.5
***************
*** 1,37 ****
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Tokens.NumberToken;
! import MathLib.Tokens.Token;
! import MathLib.Tokens.OperandToken;
! import MathLib.Functions.ExternalFunction;
  
! public class GradToDeg extends ExternalFunction
  {
! 	/**converts value from gradiants to degrees
! 	if the parameter is a matrix then all elements get converted
! 	@param operads[0] = value to convert
! 	@return the converted value*/
! 	public OperandToken evaluate(Token[] operands)
! 	{
! 		OperandToken result = new NumberToken(0);
! 		if(operands[0] != null && operands[0] instanceof NumberToken)
! 		{
! 			NumberToken value = ((NumberToken)operands[0]);
! 			double[][] values = value.getReValues();
! 			int sizeY = value.getSizeY();
! 			int sizeX = value.getSizeX();
! 			double[][] results = new double[sizeY][sizeX];
! 			
! 			for(int yy = 0; yy < sizeY; yy++)
! 			{
! 				for(int xx = 0; xx < sizeX; xx++)
! 				{
! 					results[yy][xx] = values[yy][xx] * 90 / 100;
! 				}				
! 			}
! 			result = new NumberToken(results);
! 		}
! 		return result;
! 	}
  
  }
--- 1,25 ----
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Functions.ExternalElementWiseFunction;
  
! public class GradToDeg extends ExternalElementWiseFunction
  {
!     
!     public GradToDeg()
!     {
!         name = "GradToDeg";
!     }
!     
!     /**converts value from gradiants to degrees
!     @param operads[0] = value to convert
!     @return the converted value*/
!     public double[] evaluateValue(double[] arg)
!     {
!         double[] result = new double[2];
!         
!         result[REAL] = arg[REAL] * 90 / 100;
!         
!         return result;
!     }
  
  }
***************
*** 41,51 ****
  trigonometric
  @SYNTAX
! degrees=GRADTODEG(gradients)
  @DOC
  converts the angle from gradients to degrees.
  @NOTES
  @EXAMPLES
! GRADTODEG(200) = 180
! GRADTODEG(100) = 100
  @SEE
  gradtodeg, degtograd, radtograd, degtorad, radtodeg
--- 29,39 ----
  trigonometric
  @SYNTAX
! degrees = gradtodeg(gradients)
  @DOC
  converts the angle from gradients to degrees.
  @NOTES
  @EXAMPLES
! gradtodeg(200) = 180
! gradtodeg(100) = 100
  @SEE
  gradtodeg, degtograd, radtograd, degtorad, radtodeg

Index: RadToGrad.java
===================================================================
RCS file: /cvsroot/mathlib/mathlib/Source/MathLib/Functions/Trigonometric/RadToGrad.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RadToGrad.java	26 Dec 2006 12:26:38 -0000	1.4
--- RadToGrad.java	10 Jan 2007 18:48:59 -0000	1.5
***************
*** 1,37 ****
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Tokens.NumberToken;
! import MathLib.Tokens.Token;
! import MathLib.Tokens.OperandToken;
! import MathLib.Functions.ExternalFunction;
  
! public class RadToGrad extends ExternalFunction
  {
! 	/**converts value from radians to gradients
! 	if the parameter is a matrix then all elements get converted
! 	@param operads[0] = value to convert
! 	@return the converted value*/
! 	public OperandToken evaluate(Token[] operands)
! 	{
! 		OperandToken result = new NumberToken(0);
! 		if(operands[0] != null && operands[0] instanceof NumberToken)
! 		{
! 			NumberToken value = ((NumberToken)operands[0]);
! 			double[][] values = value.getReValues();
! 			int sizeY = value.getSizeY();
! 			int sizeX = value.getSizeX();
! 			double[][] results = new double[sizeY][sizeX];
! 			
! 			for(int yy = 0; yy < sizeY; yy++)
! 			{
! 				for(int xx = 0; xx < sizeX; xx++)
! 				{
! 					results[yy][xx] = values[yy][xx] * 200 / Math.PI;
! 				}				
! 			}
! 			result = new NumberToken(results);
! 		}
! 		return result;
! 	}
  
  }
--- 1,25 ----
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Functions.ExternalElementWiseFunction;
  
! public class RadToGrad extends ExternalElementWiseFunction
  {
!     
!     public RadToGrad()
!     {
!         name = "RadToGrad";
!     }
!     
!     /**converts value from radians to gradients
!     @param operads[0] = value to convert
!     @return the converted value*/
!     public double[] evaluateValue(double[] arg)
!     {
!         double[] result = new double[2];
!         
!         result[REAL] = arg[REAL]  * 200 / Math.PI;
!         
!         return result;
!     }
  
  }
***************
*** 41,51 ****
  trigonometric
  @SYNTAX
! gradients = RADTOGRAD(radians)
  @DOC
  converts the angle from radians to gradients.
  @NOTES
  @EXAMPLES
! RADTOGRAD(3.141592653589793) = 200
! RADTOGRAD(1.5707963267948966) = 100
  @SEE
  degtograd, radtograd, degtorad, radtodeg
--- 29,39 ----
  trigonometric
  @SYNTAX
! gradients = radtograd(radians)
  @DOC
  converts the angle from radians to gradients.
  @NOTES
  @EXAMPLES
! radtograd(3.141592653589793) = 200
! radtograd(1.570796326794896) = 100
  @SEE
  degtograd, radtograd, degtorad, radtodeg

Index: DegToGrad.java
===================================================================
RCS file: /cvsroot/mathlib/mathlib/Source/MathLib/Functions/Trigonometric/DegToGrad.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DegToGrad.java	26 Dec 2006 12:26:40 -0000	1.4
--- DegToGrad.java	10 Jan 2007 18:48:59 -0000	1.5
***************
*** 1,35 ****
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Tokens.NumberToken;
! import MathLib.Tokens.Token;
! import MathLib.Tokens.OperandToken;
! import MathLib.Functions.ExternalFunction;
  
! public class DegToGrad extends ExternalFunction
  {
  	/**converts value from degrees to gradients
  	if the parameter is a matrix then all elements get converted
  	@param operads[0] = value to convert
  	@return the converted value*/
! 	public OperandToken evaluate(Token[] operands)
! 	{
! 		OperandToken result = new NumberToken(0);
! 		if(operands[0] != null && operands[0] instanceof NumberToken)
! 		{
! 			NumberToken value = ((NumberToken)operands[0]);
! 			double[][] values = value.getReValues();
! 			int sizeY = value.getSizeY();
! 			int sizeX = value.getSizeX();
! 			double[][] results = new double[sizeY][sizeX];
! 			
! 			for(int yy = 0; yy < sizeY; yy++)
! 			{
! 				for(int xx = 0; xx < sizeX; xx++)
! 				{
! 					results[yy][xx] = values[yy][xx] * 100 / 90;
! 				}				
! 			}
! 			result = new NumberToken(results);
! 		}
  		return result;
  	}
--- 1,24 ----
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Functions.ExternalElementWiseFunction;
  
! public class DegToGrad extends ExternalElementWiseFunction
  {
+     
+     public DegToGrad()
+     {
+         name = "DegToGrad";
+     }
+     
  	/**converts value from degrees to gradients
  	if the parameter is a matrix then all elements get converted
  	@param operads[0] = value to convert
  	@return the converted value*/
!     public double[] evaluateValue(double[] arg)
!     {
!         double[] result = new double[2];
!         
!         result[REAL] = arg[REAL] * 100 / 90;
!         
  		return result;
  	}
***************
*** 41,51 ****
  trigonometric
  @SYNTAX
! gradients = DEGTOGRAD(degrees)
  @DOC
  converts the angle from degrees to gradients.
  @NOTES
  @EXAMPLES
! DEGTOGRAD(180) = 200
! DEGTOGRAD(90) = 100
  @SEE
  gradtodeg, degtograd, radtograd, degtorad, radtodeg
--- 30,40 ----
  trigonometric
  @SYNTAX
! gradients = degtograd(degrees)
  @DOC
  converts the angle from degrees to gradients.
  @NOTES
  @EXAMPLES
! degtograd(180) = 200
! degtograd(90) = 100
  @SEE
  gradtodeg, degtograd, radtograd, degtorad, radtodeg

Index: RadToDeg.java
===================================================================
RCS file: /cvsroot/mathlib/mathlib/Source/MathLib/Functions/Trigonometric/RadToDeg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RadToDeg.java	26 Dec 2006 12:26:41 -0000	1.4
--- RadToDeg.java	10 Jan 2007 18:48:59 -0000	1.5
***************
*** 1,37 ****
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Tokens.NumberToken;
! import MathLib.Tokens.Token;
! import MathLib.Tokens.OperandToken;
! import MathLib.Functions.ExternalFunction;
  
! public class RadToDeg extends ExternalFunction
  {
! 	/**converts value from radians to degrees
! 	if the parameter is a matrix then all elements get converted
! 	@param operads[0] = value to convert
! 	@return the converted value*/
! 	public OperandToken evaluate(Token[] operands)
! 	{
! 		OperandToken result = new NumberToken(0);
! 		if(operands[0] != null && operands[0] instanceof NumberToken)
! 		{
! 			NumberToken value = ((NumberToken)operands[0]);
! 			double[][] values = value.getReValues();
! 			int sizeY = value.getSizeY();
! 			int sizeX = value.getSizeX();
! 			double[][] results = new double[sizeY][sizeX];
! 			
! 			for(int yy = 0; yy < sizeY; yy++)
! 			{
! 				for(int xx = 0; xx < sizeX; xx++)
! 				{
! 					results[yy][xx] = values[yy][xx] * 180 / Math.PI;
! 				}				
! 			}
! 			result = new NumberToken(results);
! 		}
! 		return result;
! 	}
  }
  
--- 1,26 ----
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Functions.ExternalElementWiseFunction;
  
! public class RadToDeg extends ExternalElementWiseFunction
  {
!     
!     public RadToDeg()
!     {
!         name = "RadToDeg";
!     }
!     
!     /**converts value from radians to degrees
!     @param operands[0] = value to convert
!     @return the converted value*/
!     public double[] evaluateValue(double[] arg)
!     {
!         double[] result = new double[2];
!         
!         result[REAL] = arg[REAL]  * 180 / Math.PI;
!         
!         return result;
!     }
! 
  }
  
***************
*** 40,50 ****
  trigonometric
  @SYNTAX
! degrees = RADTODEG(radians)
  @DOC
  converts the angle from radians to degrees.
  @NOTES
  @EXAMPLES
! RADTODEG(3.141592653589793) = 180
! RADTODEG(1.5707963267948966) = 90
  @SEE
  gradtodeg, degtograd, radtograd, degtorad, radtodeg
--- 29,39 ----
  trigonometric
  @SYNTAX
! degrees = radtodeg(radians)
  @DOC
  converts the angle from radians to degrees.
  @NOTES
  @EXAMPLES
! radtodeg(3.141592653589793)  = 180
! radtodeg(1.5707963267948966) = 90
  @SEE
  gradtodeg, degtograd, radtograd, degtorad, radtodeg

Index: GradToRad.java
===================================================================
RCS file: /cvsroot/mathlib/mathlib/Source/MathLib/Functions/Trigonometric/GradToRad.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GradToRad.java	26 Dec 2006 12:26:40 -0000	1.4
--- GradToRad.java	10 Jan 2007 18:48:59 -0000	1.5
***************
*** 1,37 ****
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Tokens.NumberToken;
! import MathLib.Tokens.Token;
! import MathLib.Tokens.OperandToken;
! import MathLib.Functions.ExternalFunction;
  
! public class GradToRad extends ExternalFunction
  {
! 	/**converts value from gradients to radians
! 	if the parameter is a matrix then all elements get converted
! 	@param operads[0] = value to convert
! 	@return the converted value*/
! 	public OperandToken evaluate(Token[] operands)
! 	{
! 		OperandToken result = new NumberToken(0);
! 		if(operands[0] != null && operands[0] instanceof NumberToken)
! 		{
! 			NumberToken value = ((NumberToken)operands[0]);
! 			double[][] values = value.getReValues();
! 			int sizeY = value.getSizeY();
! 			int sizeX = value.getSizeX();
! 			double[][] results = new double[sizeY][sizeX];
! 			
! 			for(int yy = 0; yy < sizeY; yy++)
! 			{
! 				for(int xx = 0; xx < sizeX; xx++)
! 				{
! 					results[yy][xx] = values[yy][xx] * Math.PI / 200;
! 				}				
! 			}
! 			result = new NumberToken(results);
! 		}
! 		return result;
! 	}
  
  }
--- 1,25 ----
  package MathLib.Functions.Trigonometric;
  
! import MathLib.Functions.ExternalElementWiseFunction;
  
! public class GradToRad extends ExternalElementWiseFunction
  {
!     
!     public GradToRad()
!     {
!         name = "GradToRad";
!     }
!     
!     /**converts value from gradients to radians
!     @param operands[0] = value to convert
!     @return the converted value*/
!     public double[] evaluateValue(double[] arg)
!     {
!         double[] result = new double[2];
!         
!         result[REAL] = arg[REAL] * Math.PI / 200;
!         
!         return result;
!     }
  
  }
***************
*** 41,51 ****
  trigonometric
  @SYNTAX
! radians = GRADTORAD(gradients)
  @DOC
  converts the angle from gradients to radians.
  @NOTES
  @EXAMPLES
! GRADTORAD(200) = 3.141592653589793
! GRADTORAD(100) = 1.5707963267948966
  @SEE
  gradtodeg, degtograd, radtograd, degtorad, radtodeg
--- 29,39 ----
  trigonometric
  @SYNTAX
! radians = gradtorad(gradients)
  @DOC
  converts the angle from gradients to radians.
  @NOTES
  @EXAMPLES
! gradtorad(200) = 3.141592653589793
! gradtorad(100) = 1.5707963267948966
  @SEE
  gradtodeg, degtograd, radtograd, degtorad, radtodeg