2014-07-08 03:11:14 -04:00
# include "EmberCommonPch.h"
# include "EmberTester.h"
# include "JpegUtils.h"
# include <queue>
# include <list>
# include <deque>
/// <summary>
/// EmberTester is a scratch area used for on the fly testing.
/// It may become a more formalized automated testing system
/// in the future. At the moment it isn't expected to build or
/// give any useful insight into the workings of Ember.
/// </summary>
using namespace EmberNs ;
//#define TEST_CL 1
template < typename T >
void SaveFinalImage ( Renderer < T , T > & renderer , vector < unsigned char > & pixels , char * suffix )
{
Timing t ;
//renderer.AccumulatorToFinalImage(pixels);
//t.Toc("AccumulatorToFinalImage()");
long newSize ;
char ch [ 50 ] ;
sprintf_s ( ch , 50 , " . \\ BasicFlame_%d_%s.bmp " , sizeof ( T ) , suffix ) ;
BYTE * bgrBuf = ConvertRGBToBMPBuffer ( pixels . data ( ) , renderer . FinalRasW ( ) , renderer . FinalRasH ( ) , newSize ) ;
SaveBMP ( ch , bgrBuf , renderer . FinalRasW ( ) , renderer . FinalRasH ( ) , newSize ) ;
delete [ ] bgrBuf ;
}
template < typename T >
Ember < T > CreateBasicEmber ( unsigned int width , unsigned int height , unsigned int ss , T quality , T centerX , T centerY , T rotate )
{
Timing t ;
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ;
//t.Tic();
Ember < T > ember1 ;
//t.Toc("TestBasicFlame() : Constructor()");
//t.Tic();
ember1 . m_FinalRasW = width ;
ember1 . m_FinalRasH = height ;
ember1 . m_Supersample = ss ;
ember1 . m_Quality = quality ;
ember1 . m_CenterX = centerX ;
ember1 . m_CenterY = centerY ;
ember1 . m_Rotate = rotate ;
Xform < T > xform1 ( T ( 0.25 ) , rand . Frand01 < T > ( ) , rand . Frand11 < T > ( ) , T ( 1 ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) ) ;
Xform < T > xform2 ( T ( 0.25 ) , rand . Frand01 < T > ( ) , rand . Frand11 < T > ( ) , T ( 1 ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) ) ;
Xform < T > xform3 ( T ( 0.25 ) , rand . Frand01 < T > ( ) , rand . Frand11 < T > ( ) , T ( 1 ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) ) ;
Xform < T > xform4 ( T ( 0.25 ) , rand . Frand01 < T > ( ) , rand . Frand11 < T > ( ) , T ( 1 ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) ) ;
xform1 . AddVariation ( new SphericalVariation < T > ( ) ) ;
xform2 . AddVariation ( new SphericalVariation < T > ( ) ) ;
xform3 . AddVariation ( new SphericalVariation < T > ( ) ) ;
xform4 . AddVariation ( new SphericalVariation < T > ( ) ) ;
xform4 . AddVariation ( new BlobVariation < T > ( ) ) ;
ember1 . AddXform ( xform1 ) ;
ember1 . AddXform ( xform2 ) ;
ember1 . AddXform ( xform3 ) ;
ember1 . AddXform ( xform4 ) ;
//ember1.SetFinalXform(xform4);
return ember1 ;
}
string GetEmberCLKernelString ( Ember < float > & ember , bool iter , bool log , bool de , unsigned int ss , bool accum )
{
ostringstream os ;
IterOpenCLKernelCreator < float > iterCreator ;
DEOpenCLKernelCreator < float > deCreator ;
FinalAccumOpenCLKernelCreator < float > accumCreator ;
pair < string , vector < float > > pair ;
iterCreator . ParVarIndexDefines ( ember , pair ) ;
if ( iter )
os < < " Iter kernel: \n " < < iterCreator . CreateIterKernelString ( ember , pair . first , true ) ;
if ( log )
os < < " Log scale de kernel: \n " < < deCreator . LogScaleAssignDEKernel ( ) ;
//if (de)
// os << "Gaussian DE kernel: \n" << deCreator.GaussianDEKernel(ss);
//if (accum)
// os << "Accum kernel: \n" << accumCreator.FinalAccumKernelLateClipWithoutAlpha();
return os . str ( ) ;
}
2014-10-14 11:53:15 -04:00
void MakeTestAllVarsRegPrePostComboFile ( const string & filename )
2014-07-08 03:11:14 -04:00
{
EmberToXml < float > writer ;
vector < Ember < float > > embers ;
VariationList < float > varList ;
unsigned int index = 0 ;
PaletteList < float > paletteList ;
ostringstream ss ;
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ;
paletteList . Init ( " flam3-palettes.xml " ) ;
Timing t ;
Ember < float > emberNoVars ;
emberNoVars . m_FinalRasW = 640 ;
emberNoVars . m_FinalRasH = 480 ;
emberNoVars . m_Quality = 100 ;
Xform < float > xform1 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform2 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform3 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform4 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform5 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform6 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform7 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
emberNoVars . AddXform ( xform1 ) ;
emberNoVars . AddXform ( xform2 ) ;
emberNoVars . AddXform ( xform3 ) ;
emberNoVars . AddXform ( xform4 ) ;
emberNoVars . AddXform ( xform5 ) ;
emberNoVars . AddXform ( xform6 ) ;
emberNoVars . AddXform ( xform7 ) ;
ss < < " NoVars " ;
emberNoVars . m_Name = ss . str ( ) ;
ss . str ( " " ) ;
emberNoVars . m_Palette = * paletteList . GetPalette ( 0 ) ;
embers . push_back ( emberNoVars ) ;
while ( index < varList . RegSize ( ) )
{
Ember < float > ember1 ;
2014-10-18 17:07:07 -04:00
unique_ptr < Variation < float > > regVar ( varList . GetVariationCopy ( index , VARTYPE_REG ) ) ;
unique_ptr < Variation < float > > preVar ( varList . GetVariationCopy ( " pre_ " + regVar - > Name ( ) ) ) ;
unique_ptr < Variation < float > > postVar ( varList . GetVariationCopy ( " post_ " + regVar - > Name ( ) ) ) ;
2014-07-08 03:11:14 -04:00
ember1 . m_FinalRasW = 640 ;
ember1 . m_FinalRasH = 480 ;
ember1 . m_Quality = 100 ;
Xform < float > xform1 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform2 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform3 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform4 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform5 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform6 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform7 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
if ( preVar . get ( ) & & postVar . get ( ) )
{
xform1 . AddVariation ( preVar - > Copy ( ) ) ;
xform2 . AddVariation ( regVar - > Copy ( ) ) ;
xform3 . AddVariation ( postVar - > Copy ( ) ) ;
xform4 . AddVariation ( preVar - > Copy ( ) ) ;
xform4 . AddVariation ( regVar - > Copy ( ) ) ;
xform5 . AddVariation ( preVar - > Copy ( ) ) ;
xform5 . AddVariation ( postVar - > Copy ( ) ) ;
xform6 . AddVariation ( regVar - > Copy ( ) ) ;
xform6 . AddVariation ( postVar - > Copy ( ) ) ;
xform7 . AddVariation ( preVar - > Copy ( ) ) ;
xform7 . AddVariation ( regVar - > Copy ( ) ) ;
xform7 . AddVariation ( postVar - > Copy ( ) ) ;
ember1 . AddXform ( xform1 ) ;
ember1 . AddXform ( xform2 ) ;
ember1 . AddXform ( xform3 ) ;
ember1 . AddXform ( xform4 ) ;
ember1 . AddXform ( xform5 ) ;
ember1 . AddXform ( xform6 ) ;
ember1 . AddXform ( xform7 ) ;
}
else
{
xform1 . AddVariation ( regVar - > Copy ( ) ) ;
xform2 . AddVariation ( regVar - > Copy ( ) ) ;
xform3 . AddVariation ( regVar - > Copy ( ) ) ;
xform4 . AddVariation ( regVar - > Copy ( ) ) ;
ember1 . AddXform ( xform1 ) ;
ember1 . AddXform ( xform2 ) ;
ember1 . AddXform ( xform3 ) ;
ember1 . AddXform ( xform4 ) ;
}
ss < < index < < " _ " < < regVar - > Name ( ) ;
ember1 . m_Name = ss . str ( ) ;
ss . str ( " " ) ;
ember1 . m_Palette = * paletteList . GetPalette ( index % paletteList . Count ( ) ) ;
index + + ;
embers . push_back ( ember1 ) ;
}
t . Toc ( " Creating embers for all possible variations " ) ;
writer . Save ( filename , embers , 0 , true , false , true ) ;
}
void TestAtomicAdd ( )
{
size_t i ;
ostringstream os ;
OpenCLWrapper wrapper ;
vector < float > vec ( 32 ) ;
os < < ConstantDefinesString ( false ) < < UnionCLStructString < < endl ;
os < <
" void AtomicAdd(volatile __global float* source, const float operand) \n "
" { \n "
" union \n "
" { \n "
" unsigned int intVal; \n "
" float floatVal; \n "
" } newVal; \n "
" \n "
" union \n "
" { \n "
" unsigned int intVal; \n "
" float floatVal; \n "
" } prevVal; \n "
" \n "
" do \n "
" { \n "
" prevVal.floatVal = *source; \n "
" newVal.floatVal = prevVal.floatVal + operand; \n "
" } while (atomic_cmpxchg((volatile __global unsigned int*)source, prevVal.intVal, newVal.intVal) != prevVal.intVal); \n "
" } \n "
" \n "
" __kernel void MyKernel( \n "
" __global float* buff, \n "
" unsigned int lockit \n "
" \t ) \n "
" { \n "
" unsigned int index = THREAD_ID_X; \n "
" \n "
" if (lockit) \n "
" { \n "
" AtomicAdd(&(buff[index]), (float)index * 0.54321); \n "
" } \n "
" else \n "
" { \n "
" buff[index] += (float)index * 0.54321; \n "
" } \n "
" } \n " ;
string program = os . str ( ) ;
string entry = " MyKernel " ;
if ( wrapper . Init ( 0 , 0 ) )
{
for ( i = 0 ; i < vec . size ( ) ; i + + )
vec [ i ] = ( i * 10.2234f ) ;
if ( wrapper . AddAndWriteBuffer ( " buff " , ( void * ) vec . data ( ) , ( unsigned int ) vec . size ( ) * sizeof ( vec [ 0 ] ) ) )
{
if ( wrapper . AddProgram ( entry , program , entry , false ) )
{
wrapper . SetBufferArg ( 0 , 0 , 0 ) ;
wrapper . SetArg < unsigned int > ( 0 , 1 , 0 ) ;
if ( wrapper . RunKernel ( 0 ,
32 , //Total grid dims.
1 ,
1 ,
1 , //Individual block dims.
1 ,
1 ) )
{
wrapper . ReadBuffer ( 0 , vec . data ( ) , ( unsigned int ) vec . size ( ) * sizeof ( vec [ 0 ] ) ) ;
cout < < " Vector after unlocked add: " < < endl ;
for ( i = 0 ; i < vec . size ( ) ; i + + )
{
cout < < " vec[ " < < i < < " ] = " < < vec [ i ] < < endl ;
}
for ( i = 0 ; i < vec . size ( ) ; i + + )
vec [ i ] = ( i * 10.2234f ) ;
wrapper . AddAndWriteBuffer ( " buff " , ( void * ) vec . data ( ) , ( unsigned int ) vec . size ( ) * sizeof ( vec [ 0 ] ) ) ;
wrapper . SetBufferArg ( 0 , 0 , 0 ) ;
wrapper . SetArg < unsigned int > ( 0 , 1 , 1 ) ;
if ( wrapper . RunKernel ( 0 ,
32 , //Total grid dims.
1 ,
1 ,
1 , //Individual block dims.
1 ,
1 ) )
{
wrapper . ReadBuffer ( 0 , vec . data ( ) , ( unsigned int ) vec . size ( ) * sizeof ( vec [ 0 ] ) ) ;
cout < < " \n \n Vector after locked add: " < < endl ;
for ( i = 0 ; i < vec . size ( ) ; i + + )
{
cout < < " vec[ " < < i < < " ] = " < < vec [ i ] < < endl ;
}
}
}
}
}
}
}
template < typename T >
bool SearchVar ( Variation < T > * var , vector < string > & stringVec , bool matchAll )
{
bool ret = false ;
size_t i ;
string cl = var - > OpenCLString ( ) ;
if ( matchAll )
{
for ( i = 0 ; i < stringVec . size ( ) ; i + + )
{
if ( cl . find ( stringVec [ i ] ) = = std : : string : : npos )
{
break ;
}
}
ret = ( i = = stringVec . size ( ) ) ;
}
else
{
for ( i = 0 ; i < stringVec . size ( ) ; i + + )
{
if ( cl . find ( stringVec [ i ] ) ! = std : : string : : npos )
{
ret = true ;
break ;
}
}
}
return ret ;
}
template < typename T >
static vector < Variation < T > * > FindVarsWith ( vector < string > & stringVec , bool findAll = true )
{
int index = 0 ;
VariationList < T > vl ;
vector < Variation < T > * > vec ;
while ( index < vl . RegSize ( ) )
{
Variation < T > * regVar = vl . GetVariation ( index , VARTYPE_REG ) ;
if ( SearchVar ( regVar , stringVec , false ) )
{
vec . push_back ( regVar - > Copy ( ) ) ;
if ( ! findAll )
break ;
}
index + + ;
}
return vec ;
}
bool TestVarCounts ( )
{
VariationList < float > vlf ;
# ifdef DO_DOUBLE
VariationList < double > vld ;
bool success ( ( vlf . Size ( ) = = vld . Size ( ) ) & & ( vlf . Size ( ) = = LAST_VAR ) ) ;
# else
bool success = true ;
# endif
unsigned int start = ( unsigned int ) VAR_ARCH ;
if ( ! success )
{
cout < < " Variation list size " < < vlf . Size ( ) < < " does not equal the max var ID enum " < < ( unsigned int ) LAST_VAR < < " . " < < endl ;
}
for ( ; start < ( unsigned int ) LAST_VAR ; start + + )
{
Variation < float > * var = vlf . GetVariation ( ( eVariationId ) start ) ;
if ( ! var )
{
cout < < " Variation " < < start < < " was not found. " < < endl ;
success = false ;
}
}
return success ;
}
template < typename T >
bool TestVarUnique ( )
{
bool success = true ;
VariationList < T > vl ;
vector < eVariationId > ids ;
vector < string > names ;
ids . reserve ( vl . Size ( ) ) ;
names . reserve ( vl . Size ( ) ) ;
for ( size_t i = 0 ; i < vl . Size ( ) ; i + + )
{
Variation < T > * var = vl . GetVariation ( i ) ;
if ( std : : find ( ids . begin ( ) , ids . end ( ) , var - > VariationId ( ) ) ! = ids . end ( ) )
{
cout < < " Variation " < < var - > Name ( ) < < " was a duplicate ID entry. " < < endl ;
success = false ;
}
else
{
ids . push_back ( var - > VariationId ( ) ) ;
}
if ( std : : find ( names . begin ( ) , names . end ( ) , var - > Name ( ) ) ! = names . end ( ) )
{
cout < < " Variation " < < var - > Name ( ) < < " was a duplicate name entry. " < < endl ;
success = false ;
}
else
{
names . push_back ( var - > Name ( ) ) ;
}
}
return success ;
}
template < typename sT , typename dT >
bool TestVarPrecalcEqual ( Variation < sT > * var1 , Variation < dT > * var2 )
{
bool success = true ;
if ( var1 & & var2 )
{
if ( var1 - > NeedPrecalcSumSquares ( ) ! = var2 - > NeedPrecalcSumSquares ( ) )
{
cout < < " NeedPrecalcSumSquares value of " < < var1 - > NeedPrecalcSumSquares ( ) < < " for variation " < < var1 - > Name ( ) < < " != NeedPrecalcSumSquares value of " < < var2 - > NeedPrecalcSumSquares ( ) < < " for variation " < < var2 - > Name ( ) < < endl ;
success = false ;
}
if ( var1 - > NeedPrecalcSqrtSumSquares ( ) ! = var2 - > NeedPrecalcSqrtSumSquares ( ) )
{
cout < < " NeedPrecalcSqrtSumSquares value of " < < var1 - > NeedPrecalcSqrtSumSquares ( ) < < " for variation " < < var1 - > Name ( ) < < " != NeedPrecalcSqrtSumSquares value of " < < var2 - > NeedPrecalcSqrtSumSquares ( ) < < " for variation " < < var2 - > Name ( ) < < endl ;
success = false ;
}
if ( var1 - > NeedPrecalcAngles ( ) ! = var2 - > NeedPrecalcAngles ( ) )
{
cout < < " NeedPrecalcAngles value of " < < var1 - > NeedPrecalcAngles ( ) < < " for variation " < < var1 - > Name ( ) < < " != NeedPrecalcAngles value of " < < var2 - > NeedPrecalcAngles ( ) < < " for variation " < < var2 - > Name ( ) < < endl ;
success = false ;
}
if ( var1 - > NeedPrecalcAtanXY ( ) ! = var2 - > NeedPrecalcAtanXY ( ) )
{
cout < < " NeedPrecalcAtanXY value of " < < var1 - > NeedPrecalcAtanXY ( ) < < " for variation " < < var1 - > Name ( ) < < " != NeedPrecalcAtanXY value of " < < var2 - > NeedPrecalcAtanXY ( ) < < " for variation " < < var2 - > Name ( ) < < endl ;
success = false ;
}
if ( var1 - > NeedPrecalcAtanYX ( ) ! = var2 - > NeedPrecalcAtanYX ( ) )
{
cout < < " NeedPrecalcAtanYX value of " < < var1 - > NeedPrecalcAtanYX ( ) < < " for variation " < < var1 - > Name ( ) < < " != NeedPrecalcAtanYX value of " < < var2 - > NeedPrecalcAtanYX ( ) < < " for variation " < < var2 - > Name ( ) < < endl ;
success = false ;
}
}
return success ;
}
template < typename sT , typename dT >
bool TestVarEqual ( Variation < sT > * var1 , Variation < dT > * var2 )
{
bool success = true ;
if ( ! var1 | | ! var2 )
{
cout < < " Variations were null. " < < endl ;
return false ;
}
if ( var1 - > VariationId ( ) ! = var2 - > VariationId ( ) )
{
cout < < " Variation IDs were not equal: " < < var1 - > VariationId ( ) < < " != " < < var2 - > VariationId ( ) < < endl ;
success = false ;
}
if ( var1 - > VarType ( ) ! = var2 - > VarType ( ) )
{
cout < < " Variation types were not equal: " < < var1 - > VarType ( ) < < " != " < < var2 - > VarType ( ) < < endl ;
success = false ;
}
if ( var1 - > Name ( ) ! = var2 - > Name ( ) )
{
cout < < " Variation names were not equal: " < < var1 - > Name ( ) < < " != " < < var2 - > Name ( ) < < endl ;
success = false ;
}
if ( var1 - > Prefix ( ) ! = var2 - > Prefix ( ) )
{
cout < < " Variation prefixes were not equal: " < < var1 - > Prefix ( ) < < " != " < < var2 - > Prefix ( ) < < endl ;
success = false ;
}
if ( ! TestVarPrecalcEqual < sT , dT > ( var1 , var2 ) )
{
cout < < " Variation precalcs were not equal: " < < var1 - > Name ( ) < < " and " < < var2 - > Name ( ) < < " . " < < endl ;
success = false ;
}
ParametricVariation < sT > * parVar1 = dynamic_cast < ParametricVariation < sT > * > ( var1 ) ;
ParametricVariation < dT > * parVar2 = dynamic_cast < ParametricVariation < dT > * > ( var2 ) ;
if ( parVar1 & & parVar2 )
{
if ( parVar1 - > ParamCount ( ) ! = parVar2 - > ParamCount ( ) )
{
cout < < " Variation ParamCount were not equal: " < < parVar1 - > ParamCount ( ) < < " != " < < parVar2 - > ParamCount ( ) < < endl ;
success = false ;
}
vector < ParamWithName < sT > > params1 = parVar1 - > ParamsVec ( ) ;
vector < ParamWithName < dT > > params2 = parVar2 - > ParamsVec ( ) ;
for ( size_t i = 0 ; i < params1 . size ( ) ; i + + )
{
if ( params1 [ i ] . Name ( ) ! = params2 [ i ] . Name ( ) )
{
cout < < " Param Names were not equal: " < < params1 [ i ] . Name ( ) < < " != " < < params2 [ i ] . Name ( ) < < endl ;
success = false ;
}
if ( params1 [ i ] . Type ( ) ! = params2 [ i ] . Type ( ) )
{
cout < < " Param " < < params1 [ i ] . Name ( ) < < " Types were not equal: " < < params1 [ i ] . Type ( ) < < " != " < < params2 [ i ] . Type ( ) < < endl ;
success = false ;
}
if ( params1 [ i ] . IsPrecalc ( ) ! = params2 [ i ] . IsPrecalc ( ) )
{
cout < < " Param " < < params1 [ i ] . Name ( ) < < " IsPrecalc were not equal: " < < params1 [ i ] . IsPrecalc ( ) < < " != " < < params2 [ i ] . IsPrecalc ( ) < < endl ;
success = false ;
}
if ( ! IsClose < sT > ( params1 [ i ] . Def ( ) , ( sT ) params2 [ i ] . Def ( ) ) )
{
cout < < " Param " < < params1 [ i ] . Name ( ) < < " Def were not equal: " < < params1 [ i ] . Def ( ) < < " != " < < params2 [ i ] . Def ( ) < < endl ;
success = false ;
}
if ( typeid ( sT ) = = typeid ( dT ) ) //Min and max can be different for float and double.
{
if ( ! IsClose < sT > ( params1 [ i ] . Min ( ) , ( sT ) params2 [ i ] . Min ( ) ) )
{
cout < < " Param " < < params1 [ i ] . Name ( ) < < " Min were not equal: " < < params1 [ i ] . Min ( ) < < " != " < < params2 [ i ] . Min ( ) < < endl ;
success = false ;
}
if ( ! IsClose < sT > ( params1 [ i ] . Max ( ) , ( sT ) params2 [ i ] . Max ( ) ) )
{
cout < < " Param " < < params1 [ i ] . Name ( ) < < " Max were not equal: " < < params1 [ i ] . Max ( ) < < " != " < < params2 [ i ] . Max ( ) < < endl ;
success = false ;
}
}
if ( ! IsClose < sT > ( params1 [ i ] . ParamVal ( ) , ( sT ) params2 [ i ] . ParamVal ( ) , sT ( 1e-4 ) ) )
{
cout < < " Param " < < params1 [ i ] . Name ( ) < < " Val were not equal: " < < params1 [ i ] . ParamVal ( ) < < " != " < < params2 [ i ] . ParamVal ( ) < < endl ;
success = false ;
}
}
}
return success ;
}
bool TestVarPrePostNames ( )
{
bool success = true ;
VariationList < float > vlf ;
for ( size_t i = 0 ; i < vlf . Size ( ) ; i + + )
{
Variation < float > * var = vlf . GetVariation ( i ) ;
string name = var - > Name ( ) ;
if ( var - > VarType ( ) = = VARTYPE_REG )
{
if ( name . find ( " pre_ " ) = = 0 )
{
cout < < " Regular variation " < < name < < " must not start with pre_. " < < endl ;
success = false ;
}
if ( name . find ( " post_ " ) = = 0 )
{
cout < < " Regular variation " < < name < < " must not start with post_. " < < endl ;
success = false ;
}
}
else if ( var - > VarType ( ) = = VARTYPE_PRE )
{
if ( name . find ( " pre_ " ) ! = 0 )
{
cout < < " Pre variation " < < name < < " must start with pre_. " < < endl ;
success = false ;
}
}
else if ( var - > VarType ( ) = = VARTYPE_POST )
{
if ( name . find ( " post_ " ) ! = 0 )
{
cout < < " Post variation " < < name < < " must start with post_. " < < endl ;
success = false ;
}
}
else
{
cout < < " Invalid variation type. " < < endl ;
success = false ;
break ;
}
if ( ParametricVariation < float > * parVar = dynamic_cast < ParametricVariation < float > * > ( var ) )
{
vector < ParamWithName < float > > params = parVar - > ParamsVec ( ) ;
for ( size_t p = 0 ; p < params . size ( ) ; p + + )
{
if ( params [ p ] . Name ( ) . find ( name . c_str ( ) ) ! = 0 )
{
cout < < " Param " < < params [ p ] . Name ( ) < < " must start with " < < name < < endl ;
success = false ;
}
}
}
}
return success ;
}
template < typename sT , typename dT >
bool TestVarCopy ( )
{
bool success = true ;
VariationList < sT > vlf ;
for ( size_t i = 0 ; i < vlf . Size ( ) ; i + + )
{
Variation < sT > * var = vlf . GetVariation ( i ) ;
Variation < dT > * destVar = NULL ;
2014-10-18 17:07:07 -04:00
unique_ptr < Variation < sT > > copyVar ( var - > Copy ( ) ) ; //Test Copy().
2014-07-08 03:11:14 -04:00
if ( ! TestVarEqual < sT , sT > ( var , copyVar . get ( ) ) )
{
cout < < " Variations " < < var - > Name ( ) < < " < " < < typeid ( sT ) . name ( ) < < " > and " < < copyVar - > Name ( ) < < " < " < < typeid ( sT ) . name ( ) < < " > (same template type) were not equal after Copy(). " < < endl ;
success = false ;
}
var - > Copy ( destVar ) ; //Test Copy(var*);
2014-10-18 17:07:07 -04:00
unique_ptr < Variation < dT > > destPtr ( destVar ) ; //Just for deletion.
2014-07-08 03:11:14 -04:00
if ( ! TestVarEqual < sT , dT > ( var , destPtr . get ( ) ) )
{
cout < < " Variations " < < var - > Name ( ) < < " < " < < typeid ( sT ) . name ( ) < < " > and " < < destPtr - > Name ( ) < < " < " < < typeid ( dT ) . name ( ) < < " > (different template types) were not equal after Copy(Variation<T>*). " < < endl ;
success = false ;
}
}
return success ;
}
bool TestParVars ( )
{
bool success = true ;
VariationList < float > vlf ;
for ( size_t i = 0 ; i < vlf . ParametricSize ( ) ; i + + )
{
if ( ParametricVariation < float > * parVar = vlf . GetParametricVariation ( i ) )
{
if ( parVar - > ParamCount ( ) < 1 )
{
cout < < " Parametric variation " < < parVar - > Name ( ) < < " does not have any parameters. " < < endl ;
success = false ;
}
vector < string > names ;
vector < float * > addresses ;
ParamWithName < float > * params = parVar - > Params ( ) ;
names . reserve ( parVar - > ParamCount ( ) ) ;
addresses . reserve ( parVar - > ParamCount ( ) ) ;
for ( unsigned int j = 0 ; j < parVar - > ParamCount ( ) ; j + + )
{
if ( std : : find ( names . begin ( ) , names . end ( ) , params [ j ] . Name ( ) ) ! = names . end ( ) )
{
cout < < " Param " < < params [ j ] . Name ( ) < < " for variation " < < parVar - > Name ( ) < < " was a duplicate name entry. " < < endl ;
success = false ;
}
else
{
names . push_back ( params [ j ] . Name ( ) ) ;
}
if ( std : : find ( addresses . begin ( ) , addresses . end ( ) , params [ j ] . Param ( ) ) ! = addresses . end ( ) )
{
cout < < " Param address " < < params [ j ] . Param ( ) < < " for variation " < < parVar - > Name ( ) < < " was a duplicate name entry. " < < endl ;
success = false ;
}
else
{
addresses . push_back ( params [ j ] . Param ( ) ) ;
}
}
}
else
{
cout < < " Parametric variation at index " < < i < < " was NULL. " < < endl ;
success = false ;
}
}
return success ;
}
bool TestVarRegPrePost ( )
{
bool success = true ;
VariationList < float > vlf ;
for ( size_t i = 0 ; i < vlf . RegSize ( ) ; i + + )
{
Variation < float > * regVar = vlf . GetVariation ( i , VARTYPE_REG ) ;
if ( regVar )
{
if ( regVar - > Name ( ) . find ( " dc_ " ) ! = 0 )
{
string name = regVar - > Name ( ) ;
Variation < float > * preVar = vlf . GetVariation ( " pre_ " + name ) ;
Variation < float > * postVar = vlf . GetVariation ( " post_ " + name ) ;
if ( ! preVar )
{
cout < < " Pre variation equivalent of " < < name < < " could not be found. " < < endl ;
success = false ;
}
if ( ! postVar )
{
cout < < " Post variation equivalent of " < < name < < " could not be found. " < < endl ;
success = false ;
}
if ( ! TestVarPrecalcEqual < float , float > ( regVar , preVar ) )
{
cout < < " Regular and pre variation precalc test failed for " < < regVar - > Name ( ) < < " and " < < preVar - > Name ( ) < < " . " < < endl ;
success = false ;
}
if ( ! TestVarPrecalcEqual < float , float > ( regVar , postVar ) )
{
cout < < " Regular and post variation precalc test failed for " < < regVar - > Name ( ) < < " and " < < postVar - > Name ( ) < < " . " < < endl ;
success = false ;
}
}
}
else
{
cout < < " Regular variation " < < i < < " was NULL. " < < endl ;
success = false ;
}
}
return success ;
}
bool TestVarPrecalcUsedCL ( )
{
bool success = true ;
VariationList < float > vlf ;
for ( size_t i = 0 ; i < vlf . Size ( ) ; i + + )
{
Variation < float > * var = vlf . GetVariation ( i ) ;
string s = var - > OpenCLString ( ) ;
if ( var - > NeedPrecalcAngles ( ) )
{
if ( s . find ( " precalcSina " ) = = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " needed precalcSina, but it wasn't found in the OpenCL string. " < < endl ;
success = false ;
}
if ( s . find ( " precalcCosa " ) = = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " needed precalcCosa, but it wasn't found in the OpenCL string. " < < endl ;
success = false ;
}
}
else
{
if ( s . find ( " precalcSina " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " didn't need precalcSina, but it was found in the OpenCL string. " < < endl ;
success = false ;
}
if ( s . find ( " precalcCosa " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " didn't need precalcCosa, but it was found in the OpenCL string. " < < endl ;
success = false ;
}
if ( var - > NeedPrecalcSqrtSumSquares ( ) )
{
if ( s . find ( " precalcSqrtSumSquares " ) = = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " needed precalcSqrtSumSquares, but it wasn't found in the OpenCL string. " < < endl ;
success = false ;
}
}
else
{
if ( s . find ( " precalcSqrtSumSquares " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " didn't need precalcSqrtSumSquares, but it was found in the OpenCL string. " < < endl ;
success = false ;
}
if ( var - > NeedPrecalcSumSquares ( ) )
{
if ( s . find ( " precalcSumSquares " ) = = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " needed precalcSumSquares, but it wasn't found in the OpenCL string. " < < endl ;
success = false ;
}
}
else
{
if ( s . find ( " precalcSumSquares " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " didn't need precalcSumSquares, but it was found in the OpenCL string. " < < endl ;
success = false ;
}
}
}
}
if ( var - > NeedPrecalcSumSquares ( ) )
{
if ( s . find ( " SQR(vIn.x) + SQR(vIn.y) " ) ! = string : : npos | | s . find ( " vIn.x * vIn.x + vIn.y * vIn.y " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " needed precalcSumSquares, but is not using it properly. " < < endl ;
success = false ;
}
}
else
{
if ( s . find ( " precalcSumSquares " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " didn't need precalcSumSquares, but it was found in the OpenCL string. " < < endl ;
success = false ;
}
if ( s . find ( " SQR(vIn.x) + SQR(vIn.y) " ) ! = string : : npos | | s . find ( " vIn.x * vIn.x + vIn.y * vIn.y " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " did not specify precalcSumSquares, but could benefit from it. " < < endl ;
success = false ;
}
}
if ( var - > NeedPrecalcSqrtSumSquares ( ) )
{
if ( s . find ( " sqrt(SQR(vIn.x) + SQR(vIn.y)) " ) ! = string : : npos | | s . find ( " sqrt(vIn.x * vIn.x + vIn.y * vIn.y) " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " needed precalcSqrtSumSquares, but is not using it properly. " < < endl ;
success = false ;
}
}
else
{
if ( s . find ( " precalcSqrtSumSquares " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " didn't need precalcSqrtSumSquares, but it was found in the OpenCL string. " < < endl ;
success = false ;
}
if ( s . find ( " sqrt(SQR(vIn.x) + SQR(vIn.y)) " ) ! = string : : npos | | s . find ( " sqrt(vIn.x * vIn.x + vIn.y * vIn.y) " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " did not specify precalcSqrtSumSquares, but could benefit from it. " < < endl ;
success = false ;
}
}
if ( var - > NeedPrecalcAtanXY ( ) )
{
if ( s . find ( " precalcAtanxy " ) = = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " needed precalcAtanxy, but it wasn't found in the OpenCL string. " < < endl ;
success = false ;
}
}
else
{
if ( s . find ( " precalcAtanxy " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " didn't need precalcAtanxy, but it was found in the OpenCL string. " < < endl ;
success = false ;
}
if ( s . find ( " atan2(vIn.x, vIn.y) " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " did not specify precalcAtanxy, but could benefit from it. " < < endl ;
success = false ;
}
}
if ( var - > NeedPrecalcAtanYX ( ) )
{
if ( s . find ( " precalcAtanyx " ) = = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " needed precalcAtanyx, but it wasn't found in the OpenCL string. " < < endl ;
success = false ;
}
}
else
{
if ( s . find ( " precalcAtanyx " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " didn't need precalcAtanyx, but it was found in the OpenCL string. " < < endl ;
success = false ;
}
if ( s . find ( " atan2(vIn.y, vIn.x) " ) ! = string : : npos )
{
cout < < " Variation " < < var - > Name ( ) < < " did not specify precalcAtanyx, but could benefit from it. " < < endl ;
success = false ;
}
}
}
return success ;
}
bool TestVarAssignTypes ( )
{
bool success = true ;
VariationList < float > vlf ;
vector < string > vset , vsum ;
vset . push_back ( " vIn.x " ) ;
vset . push_back ( " vIn.y " ) ;
vset . push_back ( " vIn.z " ) ;
vset . push_back ( " precalcSumSquares " ) ;
vset . push_back ( " precalcSqrtSumSquares " ) ;
vset . push_back ( " precalcSina " ) ;
vset . push_back ( " precalcCosa " ) ;
vset . push_back ( " precalcAtanxy " ) ;
vset . push_back ( " precalcAtanyx " ) ;
vsum . push_back ( " vIn.x " ) ;
vsum . push_back ( " vIn.y " ) ;
//vsum.push_back("vIn.z");
vsum . push_back ( " precalcSumSquares " ) ;
vsum . push_back ( " precalcSqrtSumSquares " ) ;
vsum . push_back ( " precalcSina " ) ;
vsum . push_back ( " precalcCosa " ) ;
vsum . push_back ( " precalcAtanxy " ) ;
vsum . push_back ( " precalcAtanyx " ) ;
for ( size_t i = 0 ; i < vlf . Size ( ) ; i + + )
{
Variation < float > * var = vlf . GetVariation ( i ) ;
string s = var - > OpenCLString ( ) ;
//Only test pre and post. The assign type for regular is ignored, and will always be summed.
if ( var - > VarType ( ) ! = VARTYPE_REG )
{
if ( var - > AssignType ( ) = = ASSIGNTYPE_SET )
{
if ( ! SearchVar ( var , vset , false ) )
{
cout < < " Variation " < < var - > Name ( ) < < " had an assign type of SET, but did not use its input points. It should have an assign type of SUM. " < < endl ;
success = false ;
}
}
else if ( var - > AssignType ( ) = = ASSIGNTYPE_SUM )
{
if ( SearchVar ( var , vsum , false ) )
{
cout < < " Variation " < < var - > Name ( ) < < " had an assign type of SUM, but used its input points. It should have an assign type of SET. " < < endl ;
success = false ;
}
}
else
{
cout < < " Variation " < < var - > Name ( ) < < " had an invalid assign type of " < < var - > AssignType ( ) < < endl ;
}
}
}
return success ;
}
bool TestVarAssignVals ( )
{
bool success = true ;
VariationList < float > vlf ;
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
vector < string > xout , yout , zout ;
2014-07-08 03:11:14 -04:00
xout . push_back ( " vOut.x = " ) ;
xout . push_back ( " vOut.x += " ) ;
xout . push_back ( " vOut.x -= " ) ;
xout . push_back ( " vOut.x *= " ) ;
xout . push_back ( " vOut.x /= " ) ;
yout . push_back ( " vOut.y = " ) ;
yout . push_back ( " vOut.y += " ) ;
yout . push_back ( " vOut.y -= " ) ;
yout . push_back ( " vOut.y *= " ) ;
yout . push_back ( " vOut.y /= " ) ;
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
zout . push_back ( " vOut.z = " ) ;
zout . push_back ( " vOut.z += " ) ;
zout . push_back ( " vOut.z -= " ) ;
zout . push_back ( " vOut.z *= " ) ;
zout . push_back ( " vOut.z /= " ) ;
2014-07-08 03:11:14 -04:00
for ( size_t i = 0 ; i < vlf . Size ( ) ; i + + )
{
Variation < float > * var = vlf . GetVariation ( i ) ;
if ( ! SearchVar ( var , xout , false ) )
{
cout < < " Variation " < < var - > Name ( ) < < " did not set its x output point. If unused, at least pass through or set to 0. " < < endl ;
success = false ;
}
if ( ! SearchVar ( var , yout , false ) )
{
cout < < " Variation " < < var - > Name ( ) < < " did not set its y output point. If unused, at least pass through or set to 0. " < < endl ;
success = false ;
}
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
if ( ! SearchVar ( var , zout , false ) )
{
cout < < " Variation " < < var - > Name ( ) < < " did not set its z output point. If unused, at least pass through or set to 0. " < < endl ;
success = false ;
}
2014-07-08 03:11:14 -04:00
}
return success ;
}
2014-08-03 19:16:10 -04:00
bool TestZepsFloor ( )
{
bool success = true ;
VariationList < float > vlf ;
vector < string > zeps ;
zeps . push_back ( " Zeps(floor " ) ;
for ( size_t i = 0 ; i < vlf . Size ( ) ; i + + )
{
Variation < float > * var = vlf . GetVariation ( i ) ;
if ( SearchVar ( var , zeps , false ) )
{
cout < < " Variation " < < var - > Name ( ) < < " contains Zeps(floor()). This is fine for the GPU, but ensure the CPU uses Zeps<T>((T)Floor<T>()). " < < endl ;
success = false ;
}
}
return success ;
}
2014-07-08 03:11:14 -04:00
bool TestConstants ( )
{
bool success = true ;
VariationList < float > vlf ;
vector < string > stringVec ;
stringVec . push_back ( " 2 * M_PI " ) ;
stringVec . push_back ( " 2*M_PI " ) ;
stringVec . push_back ( " M_PI*2 " ) ;
stringVec . push_back ( " M_PI * 2 " ) ;
for ( size_t i = 0 ; i < vlf . Size ( ) ; i + + )
{
Variation < float > * var = vlf . GetVariation ( i ) ;
if ( SearchVar ( var , stringVec , false ) )
{
cout < < " Variation " < < var - > Name ( ) < < " should be using M_2PI. " < < endl ;
success = false ;
}
}
return success ;
}
void PrintAllVars ( )
{
unsigned int i = 0 ;
VariationList < float > vlf ;
while ( Variation < float > * var = vlf . GetVariation ( i + + ) )
cout < < var - > Name ( ) < < endl ;
}
void TestXformsInOutPoints ( )
{
unsigned int index = 0 ;
VariationList < float > varList ;
PaletteList < float > paletteList ;
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ;
paletteList . Init ( " flam3-palettes.xml " ) ;
while ( index < varList . RegSize ( ) )
{
vector < Xform < float > > xforms ;
2014-10-18 17:07:07 -04:00
unique_ptr < Variation < float > > regVar ( varList . GetVariationCopy ( index , VARTYPE_REG ) ) ;
2014-07-08 03:11:14 -04:00
string s = regVar - > OpenCLString ( ) + regVar - > OpenCLFuncsString ( ) ;
if ( s . find ( " MwcNext " ) = = string : : npos )
{
2014-10-18 17:07:07 -04:00
unique_ptr < Variation < float > > preVar ( varList . GetVariationCopy ( " pre_ " + regVar - > Name ( ) ) ) ;
unique_ptr < Variation < float > > postVar ( varList . GetVariationCopy ( " post_ " + regVar - > Name ( ) ) ) ;
2014-07-08 03:11:14 -04:00
Xform < float > xform0 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform1 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform2 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform3 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform4 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform5 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform6 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
Xform < float > xform7 ( 0.25f , rand . Frand01 < float > ( ) , rand . Frand11 < float > ( ) , 1 , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) , rand . Frand11 < float > ( ) ) ;
if ( preVar . get ( ) & & postVar . get ( ) )
{
xform1 . AddVariation ( preVar - > Copy ( ) ) ;
xform2 . AddVariation ( regVar - > Copy ( ) ) ;
xform3 . AddVariation ( postVar - > Copy ( ) ) ;
xform4 . AddVariation ( preVar - > Copy ( ) ) ;
xform4 . AddVariation ( regVar - > Copy ( ) ) ;
xform5 . AddVariation ( preVar - > Copy ( ) ) ;
xform5 . AddVariation ( postVar - > Copy ( ) ) ;
xform6 . AddVariation ( regVar - > Copy ( ) ) ;
xform6 . AddVariation ( postVar - > Copy ( ) ) ;
xform7 . AddVariation ( preVar - > Copy ( ) ) ;
xform7 . AddVariation ( regVar - > Copy ( ) ) ;
xform7 . AddVariation ( postVar - > Copy ( ) ) ;
xforms . push_back ( xform0 ) ;
xforms . push_back ( xform1 ) ;
xforms . push_back ( xform2 ) ;
xforms . push_back ( xform3 ) ;
xforms . push_back ( xform4 ) ;
xforms . push_back ( xform5 ) ;
xforms . push_back ( xform6 ) ;
xforms . push_back ( xform7 ) ;
}
else
{
xform1 . AddVariation ( regVar - > Copy ( ) ) ;
xforms . push_back ( xform0 ) ;
xforms . push_back ( xform1 ) ;
}
for ( size_t i = 0 ; i < xforms . size ( ) ; i + + )
{
bool badVals = false ;
Point < float > orig ;
orig . m_X = rand . Frand11 < float > ( ) ;
orig . m_Y = rand . Frand11 < float > ( ) ;
orig . m_Z = rand . Frand11 < float > ( ) ;
orig . m_ColorX = rand . Frand01 < float > ( ) ;
orig . m_VizAdjusted = rand . Frand01 < float > ( ) ;
Point < float > p1 = orig , p2 = orig , p3 ;
xforms [ i ] . Apply ( & p1 , & p1 , rand ) ;
xforms [ i ] . Apply ( & p2 , & p3 , rand ) ;
badVals | = ( p1 . m_X ! = p1 . m_X ) ;
badVals | = ( p1 . m_Y ! = p1 . m_Y ) ;
badVals | = ( p1 . m_Z ! = p1 . m_Z ) ;
badVals | = ( p1 . m_ColorX ! = p1 . m_ColorX ) ;
badVals | = ( p1 . m_VizAdjusted ! = p1 . m_VizAdjusted ) ;
badVals | = ( p3 . m_X ! = p3 . m_X ) ;
badVals | = ( p3 . m_Y ! = p3 . m_Y ) ;
badVals | = ( p3 . m_Z ! = p3 . m_Z ) ;
badVals | = ( p3 . m_ColorX ! = p3 . m_ColorX ) ;
badVals | = ( p3 . m_VizAdjusted ! = p3 . m_VizAdjusted ) ;
if ( badVals )
cout < < " Variation " < < regVar - > Name ( ) < < " : Bad value detected " < < endl ;
if ( ! badVals )
{
if ( p1 . m_X ! = p3 . m_X )
cout < < " Variation " < < regVar - > Name ( ) < < " : p1.m_X " < < p1 . m_X < < " != p3.m_X " < < p3 . m_X < < endl ;
if ( p1 . m_Y ! = p3 . m_Y )
cout < < " Variation " < < regVar - > Name ( ) < < " : p1.m_Y " < < p1 . m_Y < < " != p3.m_Y " < < p3 . m_Y < < endl ;
if ( p1 . m_Z ! = p3 . m_Z )
cout < < " Variation " < < regVar - > Name ( ) < < " : p1.m_Z " < < p1 . m_Z < < " != p3.m_Z " < < p3 . m_Z < < endl ;
if ( p1 . m_ColorX ! = p3 . m_ColorX )
cout < < " Variation " < < regVar - > Name ( ) < < " : p1.m_ColorX " < < p1 . m_ColorX < < " != p3.m_ColorX " < < p3 . m_ColorX < < endl ;
if ( p1 . m_VizAdjusted ! = p3 . m_VizAdjusted )
cout < < " Variation " < < regVar - > Name ( ) < < " : p1.m_VizAdjusted " < < p1 . m_VizAdjusted < < " != p3.m_VizAdjusted " < < p3 . m_VizAdjusted < < endl ;
}
}
}
index + + ;
}
}
static int SortPairByTime ( const pair < string , double > & a , pair < string , double > & b )
{
return a . second < b . second ;
}
template < typename T >
void TestVarTime ( )
{
int i = 0 , iters = 10 ;
Timing t ;
VariationList < T > vlf ;
IteratorHelper < T > helper ;
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ;
vector < pair < string , double > > times ;
times . reserve ( vlf . RegSize ( ) ) ;
while ( i < vlf . RegSize ( ) )
{
double sum = 0 ;
Xform < T > xform ;
Variation < T > * var = vlf . GetVariationCopy ( i , VARTYPE_REG ) ;
xform . AddVariation ( var ) ;
for ( int iter = 0 ; iter < iters ; iter + + )
{
Point < T > p ;
xform . m_Affine . A ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . B ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . C ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . D ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . E ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . F ( rand . Frand < T > ( - 5 , 5 ) ) ;
p . m_X = rand . Frand < T > ( - 20 , 20 ) ;
p . m_Y = rand . Frand < T > ( - 20 , 20 ) ;
p . m_Z = rand . Frand < T > ( - 20 , 20 ) ;
helper . In . x = helper . m_TransX = ( xform . m_Affine . A ( ) * p . m_X ) + ( xform . m_Affine . B ( ) * p . m_Y ) + xform . m_Affine . C ( ) ;
helper . In . y = helper . m_TransY = ( xform . m_Affine . D ( ) * p . m_X ) + ( xform . m_Affine . E ( ) * p . m_Y ) + xform . m_Affine . F ( ) ;
helper . In . z = helper . m_TransZ = p . m_Z ;
helper . m_Color . x = p . m_ColorX = rand . Frand01 < T > ( ) ;
p . m_VizAdjusted = rand . Frand01 < T > ( ) ;
helper . m_PrecalcSumSquares = SQR ( helper . m_TransX ) + SQR ( helper . m_TransY ) ;
helper . m_PrecalcSqrtSumSquares = sqrt ( helper . m_PrecalcSumSquares ) ;
helper . m_PrecalcSina = helper . m_TransX / helper . m_PrecalcSqrtSumSquares ;
helper . m_PrecalcCosa = helper . m_TransY / helper . m_PrecalcSqrtSumSquares ;
helper . m_PrecalcAtanxy = atan2 ( helper . m_TransX , helper . m_TransY ) ;
helper . m_PrecalcAtanyx = atan2 ( helper . m_TransY , helper . m_TransX ) ;
var - > Random ( rand ) ;
t . Tic ( ) ;
var - > Func ( helper , p , rand ) ;
sum + = t . Toc ( ) ;
}
i + + ;
times . push_back ( pair < string , double > ( var - > Name ( ) , sum / iters ) ) ;
}
std : : sort ( times . begin ( ) , times . end ( ) , & SortPairByTime ) ;
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
//ForEach(times, [&](pair<string, double>& p) { cout << p.first << "\t" << p.second << "" << endl; });
2014-07-08 03:11:14 -04:00
}
template < typename T >
void TestOperations ( )
{
vector < string > stringVec ;
vector < Variation < T > * > varVec ;
//stringVec.push_back("%");
2014-10-14 11:53:15 -04:00
//varVec = FindVarsWith<T>(Vec);
2014-07-08 03:11:14 -04:00
//
//for (size_t i = 0; i < varVec.size(); i++)
//{
// cout << "Variation " << varVec[i]->Name() << " contained a modulo operation. Ensure its right hand operand is not zero." << endl;
//}
//
//stringVec.clear();
//ClearVec<Variation<T>>(varVec);
stringVec . push_back ( " MwcNext(mwc) % " ) ;
stringVec . push_back ( " MwcNext(mwc)% " ) ;
varVec = FindVarsWith < T > ( stringVec ) ;
for ( size_t i = 0 ; i < varVec . size ( ) ; i + + )
{
cout < < " Variation " < < varVec [ i ] - > Name ( ) < < " contained MwcNext(mwc) %. Use MwcNextRange() instead. " < < endl ;
}
stringVec . clear ( ) ;
ClearVec < Variation < T > > ( varVec ) ;
}
template < typename T >
void TestVarsSimilar ( )
{
int i = 0 , compIndex = 0 , iters = 10 ;
Timing t ;
VariationList < T > vlf ;
IteratorHelper < T > helper ;
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ;
vector < pair < string , double > > diffs ;
diffs . reserve ( vlf . RegSize ( ) ) ;
while ( i < vlf . RegSize ( ) )
{
double diff = 0 , highest = TMAX ;
Xform < T > xform ;
Variation < T > * var = vlf . GetVariationCopy ( i , VARTYPE_REG ) ;
pair < string , double > match ( " " , TMAX ) ;
compIndex = 0 ;
xform . AddVariation ( var ) ;
while ( compIndex < vlf . RegSize ( ) )
{
if ( compIndex = = i )
{
compIndex + + ;
continue ;
}
double sum = 0 , xdiff = 0 , ydiff = 0 , zdiff = 0 ;
Xform < T > xformComp ;
Variation < T > * varComp = vlf . GetVariationCopy ( compIndex , VARTYPE_REG ) ;
xformComp . AddVariation ( varComp ) ;
ParametricVariation < T > * parVar = dynamic_cast < ParametricVariation < T > * > ( var ) ;
ParametricVariation < T > * parVarComp = dynamic_cast < ParametricVariation < T > * > ( varComp ) ;
for ( int iter = 0 ; iter < iters ; iter + + )
{
Point < T > p , pComp ;
xform . m_Affine . A ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . B ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . C ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . D ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . E ( rand . Frand < T > ( - 5 , 5 ) ) ;
xform . m_Affine . F ( rand . Frand < T > ( - 5 , 5 ) ) ;
xformComp . m_Affine = xform . m_Affine ;
p . m_X = rand . Frand < T > ( - 20 , 20 ) ;
p . m_Y = rand . Frand < T > ( - 20 , 20 ) ;
p . m_Z = rand . Frand < T > ( - 20 , 20 ) ;
helper . In . x = helper . m_TransX = ( xform . m_Affine . A ( ) * p . m_X ) + ( xform . m_Affine . B ( ) * p . m_Y ) + xform . m_Affine . C ( ) ;
helper . In . y = helper . m_TransY = ( xform . m_Affine . D ( ) * p . m_X ) + ( xform . m_Affine . E ( ) * p . m_Y ) + xform . m_Affine . F ( ) ;
helper . In . z = helper . m_TransZ = p . m_Z ;
helper . m_Color . x = p . m_ColorX = rand . Frand01 < T > ( ) ;
p . m_VizAdjusted = rand . Frand01 < T > ( ) ;
pComp = p ;
helper . m_PrecalcSumSquares = SQR ( helper . m_TransX ) + SQR ( helper . m_TransY ) ;
helper . m_PrecalcSqrtSumSquares = sqrt ( helper . m_PrecalcSumSquares ) ;
helper . m_PrecalcSina = helper . m_TransX / helper . m_PrecalcSqrtSumSquares ;
helper . m_PrecalcCosa = helper . m_TransY / helper . m_PrecalcSqrtSumSquares ;
helper . m_PrecalcAtanxy = atan2 ( helper . m_TransX , helper . m_TransY ) ;
helper . m_PrecalcAtanyx = atan2 ( helper . m_TransY , helper . m_TransX ) ;
if ( parVar )
{
for ( unsigned int v = 0 ; v < parVar - > ParamCount ( ) ; v + + )
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
parVar - > SetParamVal ( v , ( T ) iter ) ;
2014-07-08 03:11:14 -04:00
}
if ( parVarComp )
{
for ( unsigned int v = 0 ; v < parVarComp - > ParamCount ( ) ; v + + )
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
parVarComp - > SetParamVal ( v , ( T ) iter ) ;
2014-07-08 03:11:14 -04:00
}
//For debugging.
if ( var - > VariationId ( ) = = VAR_BWRAPS & & varComp - > VariationId ( ) = = VAR_ECLIPSE )
{
//cout << "Break." << endl;
}
helper . Out = v4T ( 0 ) ;
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
var - > m_Weight = T ( iter + 1 ) ;
2014-07-08 03:11:14 -04:00
var - > Precalc ( ) ;
var - > Func ( helper , p , rand ) ;
v4T varOut = helper . Out ;
helper . Out = v4T ( 0 ) ;
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
varComp - > m_Weight = T ( iter + 1 ) ;
2014-07-08 03:11:14 -04:00
varComp - > Precalc ( ) ;
varComp - > Func ( helper , pComp , rand ) ;
v4T varCompOut = helper . Out ;
xdiff + = fabs ( varOut . x - varCompOut . x ) ;
ydiff + = fabs ( varOut . y - varCompOut . y ) ;
zdiff + = fabs ( varOut . z - varCompOut . z ) ;
}
sum = ( xdiff + ydiff + zdiff ) / iters ;
if ( sum < highest )
{
match . first = varComp - > Name ( ) ;
match . second = highest = sum ;
}
compIndex + + ;
}
if ( match . second < 0.001 )
cout < < " The closest match to variation " < < var - > Name ( ) < < " is " < < match . first < < " with a total difference of " < < match . second < < endl ;
i + + ;
//times.push_back(pair<string, double>(var->Name(), sum / iters));
}
//std::sort(times.begin(), times.end(), &SortPairByTime);
}
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
# ifdef TEST_CL
2014-07-08 03:11:14 -04:00
template < typename T >
void TestCpuGpuResults ( )
{
bool breakOnBad = true ;
int i = 0 ; //(int)VAR_TARGET;//Start at the one you want to test.
int iters = 10 ;
int skipped = 0 ;
T thresh = T ( 1e-3 ) ;
Timing t ;
VariationList < T > vlf ;
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ;
vector < PointCL < T > > points ;
RendererCL < T > renderer ;
if ( ! renderer . Init ( 1 , 0 , false , 0 ) )
return ;
points . resize ( renderer . TotalIterKernelCount ( ) ) ;
while ( i < vlf . RegSize ( ) )
{
bool bad = false ;
double sum = 0 ;
Variation < T > * var = vlf . GetVariation ( i , VARTYPE_REG ) ;
string s = var - > OpenCLString ( ) + var - > OpenCLFuncsString ( ) ;
if ( s . find ( " MwcNext " ) ! = string : : npos )
{
i + + ;
skipped + + ;
continue ;
}
cout < < " Testing cpu-gpu equality for variation: " < < var - > Name ( ) < < " ( " < < ( int ) var - > VariationId ( ) < < " ) " < < endl ;
for ( int iter = 0 ; iter < iters ; iter + + )
{
bool newAlloc = false ;
Point < T > p , p2 ;
Ember < T > ember ;
Xform < T > xform ;
Variation < T > * varCopy = var - > Copy ( ) ;
p . m_X = rand . Frand < T > ( - 5 , 5 ) ;
p . m_Y = rand . Frand < T > ( - 5 , 5 ) ;
p . m_Z = rand . Frand < T > ( - 5 , 5 ) ;
p . m_ColorX = rand . Frand01 < T > ( ) ;
p . m_VizAdjusted = rand . Frand01 < T > ( ) ;
varCopy - > Random ( rand ) ;
xform . AddVariation ( varCopy ) ;
ember . AddXform ( xform ) ;
ember . CacheXforms ( ) ;
renderer . SetEmber ( ember ) ;
renderer . CreateSpatialFilter ( newAlloc ) ;
renderer . CreateDEFilter ( newAlloc ) ;
renderer . ComputeBounds ( ) ;
renderer . ComputeCamera ( ) ;
renderer . AssignIterator ( ) ;
if ( ! renderer . Alloc ( ) )
return ;
points [ 0 ] . m_X = p . m_X ;
points [ 0 ] . m_Y = p . m_Y ;
points [ 0 ] . m_Z = p . m_Z ;
points [ 0 ] . m_ColorX = p . m_ColorX ;
xform . Apply ( & p , & p2 , rand ) ;
renderer . WritePoints ( points ) ;
renderer . Iterate ( 1 , 0 , 1 ) ;
renderer . ReadPoints ( points ) ;
T xdiff = fabs ( p2 . m_X - points [ 0 ] . m_X ) ;
T ydiff = fabs ( p2 . m_Y - points [ 0 ] . m_Y ) ;
T zdiff = fabs ( p2 . m_Z - points [ 0 ] . m_Z ) ;
if ( xdiff > thresh | | ydiff > thresh | | zdiff > thresh )
{
bad = true ;
cout < < __FUNCTION__ < < " : Variation cpu-gpu diff for iter " < < iter < < " : " < < varCopy - > Name ( ) < < " ( " < < ( int ) varCopy - > VariationId ( ) < < " ) xdiff: " < < xdiff < < endl ;
cout < < __FUNCTION__ < < " : Variation cpu-gpu diff for iter " < < iter < < " : " < < varCopy - > Name ( ) < < " ( " < < ( int ) varCopy - > VariationId ( ) < < " ) ydiff: " < < ydiff < < endl ;
cout < < __FUNCTION__ < < " : Variation cpu-gpu diff for iter " < < iter < < " : " < < varCopy - > Name ( ) < < " ( " < < ( int ) varCopy - > VariationId ( ) < < " ) zdiff: " < < zdiff < < endl ;
cout < < varCopy - > ToString ( ) < < endl ;
}
else
{
//cout << "Variation " << var->Name() << " had no difference between cpu and gpu for iter " << iter << endl;
}
}
if ( breakOnBad & & bad )
break ;
i + + ;
bad = false ;
}
cout < < " Skipped " < < skipped < < endl ;
}
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
template < typename T >
void TestGpuVectorRead ( )
{
T minx = TMAX , miny = TMAX , minz = TMAX , mincolorx = TMAX ;
T maxx = TLOW , maxy = TLOW , maxz = TLOW , maxcolorx = TLOW ;
double sumx = 0 , avgx = 0 ;
double sumy = 0 , avgy = 0 ;
double sumz = 0 , avgz = 0 ;
double sumcolorx = 0 , avgcolorx = 0 ;
Timing t ;
VariationList < T > vlf ;
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ;
vector < PointCL < T > > points ;
RendererCL < T > renderer ;
if ( ! renderer . Init ( 1 , 0 , false , 0 ) )
return ;
points . resize ( renderer . TotalIterKernelCount ( ) ) ;
Variation < T > * var = vlf . GetVariation ( VAR_LINEAR ) ;
bool newAlloc = false ;
Point < T > p , p2 ;
Ember < T > ember ;
Xform < T > xform ;
Variation < T > * varCopy = var - > Copy ( ) ;
p . m_X = rand . Frand < T > ( - 5 , 5 ) ;
p . m_Y = rand . Frand < T > ( - 5 , 5 ) ;
p . m_Z = rand . Frand < T > ( - 5 , 5 ) ;
p . m_ColorX = rand . Frand01 < T > ( ) ;
p . m_VizAdjusted = rand . Frand01 < T > ( ) ;
varCopy - > Random ( rand ) ;
xform . AddVariation ( varCopy ) ;
ember . AddXform ( xform ) ;
ember . CacheXforms ( ) ;
renderer . SetEmber ( ember ) ;
renderer . CreateSpatialFilter ( newAlloc ) ;
renderer . CreateDEFilter ( newAlloc ) ;
renderer . ComputeBounds ( ) ;
renderer . ComputeCamera ( ) ;
renderer . AssignIterator ( ) ;
if ( ! renderer . Alloc ( ) )
return ;
unsigned int i , iters = renderer . IterCountPerKernel ( ) * renderer . TotalIterKernelCount ( ) ; //Make each thread in each block run at least once.
renderer . Iterate ( iters , 0 , 1 ) ;
renderer . ReadPoints ( points ) ;
cout < < __FUNCTION__ < < " : GPU point test value results: " < < endl ;
for ( i = 0 ; i < points . size ( ) ; i + + )
{
cout < < " point[ " < < i < < " ].m_X = " < < points [ i ] . m_X < < endl ;
cout < < " point[ " < < i < < " ].m_Y = " < < points [ i ] . m_Y < < endl ;
cout < < " point[ " < < i < < " ].m_Z = " < < points [ i ] . m_Z < < endl ;
cout < < " point[ " < < i < < " ].m_ColorX = " < < points [ i ] . m_ColorX < < endl < < endl ;
minx = min < T > ( points [ i ] . m_X , minx ) ;
miny = min < T > ( points [ i ] . m_Y , miny ) ;
minz = min < T > ( points [ i ] . m_Z , minz ) ;
mincolorx = min < T > ( points [ i ] . m_ColorX , mincolorx ) ;
maxx = max < T > ( points [ i ] . m_X , maxx ) ;
maxy = max < T > ( points [ i ] . m_Y , maxy ) ;
maxz = max < T > ( points [ i ] . m_Z , maxz ) ;
maxcolorx = max < T > ( points [ i ] . m_ColorX , maxcolorx ) ;
sumx + = points [ i ] . m_X ;
sumy + = points [ i ] . m_Y ;
sumz + = points [ i ] . m_Z ;
sumcolorx + = points [ i ] . m_ColorX ;
}
avgx = sumx / i ;
avgy = sumy / i ;
avgz = sumz / i ;
avgcolorx = sumcolorx / i ;
cout < < " avgx = " < < avgx < < endl ;
cout < < " avgy = " < < avgy < < endl ;
cout < < " avgz = " < < avgz < < endl ;
cout < < " avgcolorx = " < < avgcolorx < < endl ;
cout < < " minx = " < < minx < < endl ;
cout < < " miny = " < < miny < < endl ;
cout < < " minz = " < < minz < < endl ;
cout < < " mincolorx = " < < mincolorx < < endl < < endl ;
cout < < " maxx = " < < maxx < < endl ;
cout < < " maxy = " < < maxy < < endl ;
cout < < " maxz = " < < maxz < < endl ;
cout < < " maxcolorx = " < < maxcolorx < < endl < < endl < < endl ;
}
# endif
template < typename T >
void TestRandomAccess ( size_t vsize , size_t ipp , bool cache )
{
size_t iters = vsize * ipp ;
vector < v4T > vec ;
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ;
vec . resize ( vsize ) ;
v4T * vdata = vec . data ( ) ;
if ( cache )
{
for ( size_t i = 0 ; i < iters ; i + + )
{
v4T v4 ( rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) ) ;
int index = rand . Rand ( ( ISAAC_INT ) vsize ) ;
v4T v42 = vdata [ index ] ;
v4 . x = log ( v4 . x ) ;
v4 . y = sqrt ( v4 . y ) ;
v4 . z = sin ( v4 . z ) ;
v4 . w = cos ( v4 . w ) ;
v4 + = T ( 1.234 ) ;
v4 * = T ( 55.55 ) ;
v4 / = T ( 0.0045 ) ;
vdata [ index ] = v4 + v42 ;
}
}
else
{
for ( size_t i = 0 ; i < iters ; i + + )
{
v4T v4 ( rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) , rand . Frand11 < T > ( ) ) ;
int index = rand . Rand ( ( ISAAC_INT ) vsize ) ;
v4 . x = log ( v4 . x ) ;
v4 . y = sqrt ( v4 . y ) ;
v4 . z = sin ( v4 . z ) ;
v4 . w = cos ( v4 . w ) ;
v4 + = T ( 1.234 ) ;
v4 * = T ( 55.55 ) ;
v4 / = T ( 0.0045 ) ;
vdata [ index ] + = v4 ;
}
}
}
template < typename T >
void TestCross ( T x , T y , T weight )
{
T s = x * x - y * y ;
T r = weight * sqrt ( 1 / ( s * s + EPS ) ) ;
T outX = x * r ;
T outY = y * r ;
cout < < " First way, outX, outY == " < < outX < < " , " < < outY < < endl ;
r = fabs ( ( x - y ) * ( x + y ) + EPS ) ;
if ( r < 0 )
r = - r ;
r = weight / r ;
outX = x * r ;
outY = y * r ;
cout < < " Second way, outX, outY == " < < outX < < " , " < < outY < < endl ;
}
2014-07-26 20:26:15 -04:00
double RandD ( QTIsaac < ISAAC_SIZE , ISAAC_INT > & rand )
{
return ( ( ( ( rand . Rand ( ) ^ ( rand . Rand ( ) < < 15 ) ) & 0xfffffff ) * 3.72529e-09 ) - 0.5 ) ;
}
2014-07-08 03:11:14 -04:00
int _tmain ( int argc , _TCHAR * argv [ ] )
{
2014-09-10 01:41:26 -04:00
//int i;
2014-07-08 03:11:14 -04:00
Timing t ( 4 ) ;
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
QTIsaac < ISAAC_SIZE , ISAAC_INT > rand ;
2014-07-08 03:11:14 -04:00
//cout << pow(-1, 5.1) << endl;
2014-07-26 20:26:15 -04:00
/*for (i = 0; i < 2500000000; i++)
{
double d = fabs ( RandD ( rand ) ) ;
if ( d > = 0.5 )
cout < < d < < endl ;
}
return 0 ; */
2014-07-08 03:11:14 -04:00
//cout << "sizeof(Ember<float>): " << sizeof(Ember<float>) << endl;
//cout << "sizeof(Ember<double>): " << sizeof(Ember<double>) << endl;
//
//cout << "sizeof(Renderer<float>): " << sizeof(Renderer<float, float>) << endl;
//cout << "sizeof(Renderer<double>): " << sizeof(Renderer<double, double>) << endl;
//
//cout << "sizeof(RendererCL<float>): " << sizeof(RendererCL<float>) << endl;
//cout << "sizeof(RendererCL<double>): " << sizeof(RendererCL<double>) << endl;
2014-10-18 17:07:07 -04:00
/*unique_ptr<LinearVariation<float>> linV(new LinearVariation<float>());
unique_ptr < PreLinearVariation < float > > preLinV ( new PreLinearVariation < float > ( ) ) ;
unique_ptr < PostLinearVariation < float > > postLinV ( new PostLinearVariation < float > ( ) ) ;
2014-07-08 03:11:14 -04:00
cout < < linV - > BaseName ( ) < < endl ;
cout < < preLinV - > BaseName ( ) < < endl ;
cout < < postLinV - > BaseName ( ) < < endl ; */
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
//float num = 1;
//float denom = 4294967296.0f;
//float frac = num / denom;
//
//cout << "num, denom, frac = " << num << ", " << denom << ", " << frac << endl;
2014-07-08 03:11:14 -04:00
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
//TestGpuVectorRead<double>();
//TestGpuVectorRead<float>();
//return 0;
2014-10-18 17:07:07 -04:00
//unique_ptr<PreFarblurVariation<float>> preFarblurV(new PreFarblurVariation<float>());
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
//size_t vsize = 1024 * 1024;
//
//t.Tic();
//TestRandomAccess<float>(vsize, 10, true);
//t.Toc("TestRandomAccess<float>(true)");
//
//t.Tic();
//TestRandomAccess<float>(vsize, 10, false);
//t.Toc("TestRandomAccess<float>(false)");
//
//t.Tic();
//TestRandomAccess<double>(vsize, 10, true);
//t.Toc("TestRandomAccess<double>(true)");
//
//t.Tic();
//TestRandomAccess<double>(vsize, 10, false);
//t.Toc("TestRandomAccess<double>(false)");
//TestCross<double>(rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5));
//TestCross<double>(rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5));
//TestCross<double>(rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5));
//TestCross<double>(rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5));
//TestCross<double>(rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5), rand.Frand<double>(-5, 5));
2014-07-08 03:11:14 -04:00
//MakeTestAllVarsRegPrePostComboFile("testallvarsout.flame");
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
//return 0;
2014-07-08 03:11:14 -04:00
//std::complex<double> cd, cd2;
//cd2 = sin(cd);
t . Tic ( ) ;
VariationList < float > vlf ;
t . Toc ( " Creating VariationList<float> " ) ;
cout < < " There are " < < vlf . Size ( ) < < " variations present. " < < endl ;
# ifdef DO_DOUBLE
t . Tic ( ) ;
VariationList < double > vld ;
t . Toc ( " Creating VariationList<double> " ) ;
# endif
t . Tic ( ) ;
TestVarCounts ( ) ;
t . Toc ( " TestVarCounts() " ) ;
t . Tic ( ) ;
TestVarUnique < float > ( ) ;
t . Toc ( " TestVarUnique<float>() " ) ;
# ifdef DO_DOUBLE
t . Tic ( ) ;
TestVarUnique < double > ( ) ;
t . Toc ( " TestVarUnique<double>() " ) ;
# endif
t . Tic ( ) ;
TestVarCopy < float , float > ( ) ;
t . Toc ( " TestVarCopy<float, float>() " ) ;
# ifdef DO_DOUBLE
t . Tic ( ) ;
TestVarCopy < double , double > ( ) ;
t . Toc ( " TestVarCopy<double, double>() " ) ;
t . Tic ( ) ;
TestVarCopy < float , double > ( ) ;
t . Toc ( " TestVarCopy<float, double>() " ) ;
t . Tic ( ) ;
TestVarCopy < double , float > ( ) ;
t . Toc ( " TestVarCopy<double, float>() " ) ;
# endif
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
t . Tic ( ) ;
TestVarRegPrePost ( ) ;
t . Toc ( " TestVarRegPrePost() " ) ;
t . Tic ( ) ;
TestParVars ( ) ;
t . Toc ( " TestParVars() " ) ;
t . Tic ( ) ;
TestVarPrePostNames ( ) ;
t . Toc ( " TestVarPrePostNames() " ) ;
t . Tic ( ) ;
TestVarPrecalcUsedCL ( ) ;
t . Toc ( " TestVarPrecalcUsedCL() " ) ;
t . Tic ( ) ;
TestVarAssignTypes ( ) ;
t . Toc ( " TestVarAssignTypes() " ) ;
t . Tic ( ) ;
TestVarAssignVals ( ) ;
t . Toc ( " TestVarAssignVals() " ) ;
2014-08-03 19:16:10 -04:00
t . Tic ( ) ;
TestZepsFloor ( ) ;
t . Toc ( " TestZepsFloor() " ) ;
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
t . Tic ( ) ;
TestConstants ( ) ;
t . Toc ( " TestConstants() " ) ;
t . Tic ( ) ;
TestXformsInOutPoints ( ) ;
t . Toc ( " TestXformsInOutPoints() " ) ;
t . Tic ( ) ;
TestVarTime < float > ( ) ;
t . Toc ( " TestVarTime() " ) ;
t . Tic ( ) ;
TestOperations < float > ( ) ;
t . Toc ( " TestOperations() " ) ;
2014-07-08 03:11:14 -04:00
//t.Tic();
//TestVarsSimilar<float>();
//t.Toc("TestVarsSimilar()");
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
# ifdef TEST_CL
//t.Tic();
//TestCpuGpuResults<float>();
//t.Toc("TestCpuGpuResults<float>()");
2014-07-08 03:11:14 -04:00
# ifdef DO_DOUBLE
Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.
--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.
--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-19 02:33:18 -04:00
//t.Tic();
//TestCpuGpuResults<double>();
//t.Toc("TestCpuGpuResults<double>()");
# endif
2014-07-08 03:11:14 -04:00
# endif
//PrintAllVars();
//_CrtDumpMemoryLeaks();
return 0 ;
}