- clean all my tests. create a lpytest repository that will be played during tests

- fix bug with production in the middle of the text

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/vplants/vplants/trunk/lpy@13754 ab253cce-29fb-0310-bb2f-979600cdbdeb

Author: fredboudon

src/cpp/lpy_parser.cpp

@@ -94,9 +94,14 @@ has_keyword_pattern(std::string::const_iterator& pos,
 			        const std::string& pattern){
 
   size_t s = pattern.size();
-  if ( (std::distance(pos,end) >= s) && 
-	  (std::string(pos,pos+s) == pattern)  && ( (pos==beg) || !isalnum(*(pos-1)) )){
-	pos+=s;
+  std::string::const_iterator res = pos+s;
+  if (
+	  (std::distance(pos,end) >= s) && 
+	  (std::string(pos,pos+s) == pattern)  && 
+	  ( (pos==beg) || !isalnum(*(pos-1)) )  && 
+	  ( (res==end) || !isalnum(*(res)) )
+	 ){
+	pos=res;
 	return true;
   }
   else return false;
@@ -442,11 +447,18 @@ Lsystem::set( const std::string&   _rules , std::string * pycode,
 		case 'p':
 		  _it2 = _it;
 		  if(has_keyword_pattern(_it,begcode,endpycode,"production")){
-            code+=std::string(beg,_it2);
-			toendlineC(_it,endpycode);
-            code+="# "+std::string(_it2,_it);
-			beg = _it;
-			mode = 0;
+			// printf("-'%c' '%c'\n",*(_it2-1),*_it);
+			/*if ((_it2 != begcode && *(_it2-1) != '\n') || (_it == *_it != ' ' && *_it != ':' && *_it != '\t')){
+				// We are not in the production statement
+				if(_it!=endpycode)++_it; toendlineA(_it,endpycode);
+			}
+			else {*/
+				code+=std::string(beg,_it2);
+				toendlineC(_it,endpycode);
+				code+="# "+std::string(_it2,_it);
+				beg = _it;
+				mode = 0;
+			// }
 		  }
 		  else if(has_keyword_pattern(_it,begcode,endpycode,"produce")){
 			  // LsysWarning("Cannot use 'produce' outside production body. Use 'nproduce' instead.",filename,lineno);
@@ -660,7 +672,7 @@ Lsystem::set( const std::string&   _rules , std::string * pycode,
               PROCESS_RULE(rule,code,addedcode,mode,group)
 		  }
 		  _it2 = _it;
-		  if(has_keyword_pattern(_it,begcode,endpycode,"group ")){
+		  if(has_keyword_pattern(_it,begcode,endpycode,"group")){
             beg = _it;
 			while( _it!=endpycode && (*_it)!=':' && (*_it)!='\n')
 			  _it++;

test/diese_bug.lpy

@@ -0,0 +1,18 @@
+Axiom: #(0.001)-(90)F(1)
+derivation length: 5
+
+production: 
+
+F(x) :
+  produce  F(x/3.0)+F(x/3.0)--F(x/3.0)+F(x/3.0)
+
+
+endlsystem
+###### INITIALISATION ######
+
+__copyright__ = """open-source GPL"""
+__description__ = """- start from an axiom representing a triangle with equal side lengths
+
+- try other fractal rules"""
+__institutes__ = """INRIA - CIRAD Virtual Plants"""
+__authors__ = """C. Godin, F. Boudon"""

test/image/bjunipc.png

@@ -0,0 +1,23 @@
+# with Pt2=0,1,0 the line is drawn from 0,0,10 to 0,1,0
+# with Pt2=0,0,1 the line is drawn from 0,0,10 to 0,0,11
+
+# following generates incorrect line, to fix save y component to something small in pt2!
+Axiom: Pt1(0,0,10) Pt2(0,0,0)
+# following generates correct line
+# Axiom: -(90) Frame  Pt1(0,10,0) Pt2(0,0,0)
+# following generates correct line
+#Axiom: Pt1(10,0,0) Pt2(0,0,0)
+
+derivation length: 1
+production:
+
+interpretation:
+
+# same thing happens if you use LineTo or MoveTo for the first pt
+Pt1(x,y,z):
+  produce MoveTo(x,y,z) Sphere(0.5) [@M(x,y,z) SetColor(2) Sphere(1.0)]
+  
+Pt2(x,y,z):
+  produce LineTo(x,y,z) Sphere(0.5) [@M(x,y,z) SetColor(3) Sphere(1.0)]
+
+endlsystem

test/lpytest/MoveToBug.lpy

@@ -0,0 +1,26 @@
+Axiom:  _(1) @Tp(0,0,1)Elasticity(0.05) +(90) @Gc() nF(10,0.1,0.02)
+
+derivation length: 1
+production:
+
+
+interpretation:
+
+
+endlsystem
+###### INITIALISATION ######
+
+__lpy_code_version__ = 1.1
+
+def __initialiseContext__(context):
+	import openalea.plantgl.all as pgl
+	radius = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(0, 0.98719, 1),(0.0357168, 0.407384, 1),(0.260088, 0.407384, 1),(0.260088, 0.949652, 1),(0.546428, 0.964524, 1),(0.555714, 0.249528, 1),(0.78476, 0.265004, 1),(0.828093, 0.942858, 1),(0.953572, 0.936943, 1),(1, 0.109243, 1)]) , 
+	    )
+	radius.name = "radius"
+	panel_0 = ({'active': True, 'visible': True, 'name': 'Panel 1'},[('Function',radius)])
+	parameterset = [panel_0,]
+	context["__functions__"] = [('radius',radius),]
+	context["__curves__"] = []
+	context["__parameterset__"] = parameterset
+	context["radius"] = pgl.QuantisedFunction(radius)

test/lpytest/nF.lpy

@@ -0,0 +1,56 @@
+dt = 0.2
+maxlilength = 2
+
+def EndEach(lstring,scene):
+   from openalea.plantgl.all import Translated
+   if scene:
+     # create a dictionnary that gives all shape for any id
+     shapedict = {}
+     for shape in scene:
+       shapedict[shape.id] = shapedict.get(shape.id,[])+[shape]
+     
+     # create a dictionnary that gives position for any id
+     positions = {}
+     for i,m in enumerate(lstring):
+         if m.name == 'I':      # look only for I module
+             firstshape = shapedict[i][0] # find geometric rep of i
+             if isinstance(firstshape.geometry,Translated) :
+                 positions[i] = firstshape.geometry.translation
+             else:
+                 positions[i] = (0,0,0)
+
+Axiom: A
+
+derivation length: 6
+production:
+
+A --> I(0)/(137.5)[+A][-A] A
+I(t) --> I(t+dt)
+
+interpretation:
+
+I(t) --> _(idiam(t)/10) F(maxlilength*ilength(t))
+
+endlsystem
+###### INITIALISATION ######
+
+__lpy_code_version__ = 1.1
+
+def __initialiseContext__(context):
+	context.animation_timestep = 0.262
+	import openalea.plantgl.all as pgl
+	ilength = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(0, 0.0769619, 1),(0.543139, 0.181159, 1),(0.800964, 0.707373, 1),(1, 1.02556, 1)]) , 
+	    )
+	ilength.name = "ilength"
+	idiam = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(0, 0.0562771, 1),(0.324675, 0.298701, 1),(0.588745, 0.532467, 1),(1, 0.679654, 1)]) , 
+	    )
+	idiam.name = "idiam"
+	panel_0 = ({'active': True, 'visible': True, 'name': 'Panel 1'},[('Function',ilength),('Function',idiam)])
+	parameterset = [panel_0,]
+	context["__functions__"] = [('ilength',ilength),('idiam',idiam),]
+	context["__curves__"] = []
+	context["__parameterset__"] = parameterset
+	context["ilength"] = pgl.QuantisedFunction(ilength)
+	context["idiam"] = pgl.QuantisedFunction(idiam)

test/lpytest/nodeposition.lpy

@@ -0,0 +1,63 @@
+dt = 0.2
+maxlilength = 2
+positions = []
+
+
+def StartEach():  
+  useGroup(getGroup()%2 +1)
+  print 'group',getGroup()
+  global positions
+  positions = []
+
+def EndEach():
+  if getGroup() == 2:
+    print len(positions)
+
+
+Axiom: A
+
+derivation length: 12
+production:
+
+group 1: # growth
+
+A --> ?P() I(dt)/(137.5)[+A][-A] A
+I(t) --> I(t+dt)
+
+
+group 2: # position retrieval
+
+?P(p) I(t):
+    global positions
+    positions.append(p) 
+
+group 0:
+interpretation:
+
+I(t) --> _(idiam(min(1.0,t))/10.) F(maxlilength*ilength(min(1.0,t)))
+?P(p) --> [,(3)@D(1.1)@O]
+
+endlsystem
+###### INITIALISATION ######
+
+__lpy_code_version__ = 1.1
+
+def __initialiseContext__(context):
+	context.animation_timestep = 0.262
+	context.options.setSelection('Early return when no matching',0)
+	import openalea.plantgl.all as pgl
+	ilength = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(0, 0.0769619, 1),(0.543139, 0.181159, 1),(0.800964, 0.707373, 1),(1, 1.02556, 1)]) , 
+	    )
+	ilength.name = "ilength"
+	idiam = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(0, 0.0562771, 1),(0.324675, 0.298701, 1),(0.588745, 0.532467, 1),(1, 0.679654, 1)]) , 
+	    )
+	idiam.name = "idiam"
+	panel_0 = ({'active': True, 'visible': True, 'name': 'Panel 1'},[('Function',ilength),('Function',idiam)])
+	parameterset = [panel_0,]
+	context["__functions__"] = [('ilength',ilength),('idiam',idiam),]
+	context["__curves__"] = []
+	context["__parameterset__"] = parameterset
+	context["ilength"] = pgl.QuantisedFunction(ilength)
+	context["idiam"] = pgl.QuantisedFunction(idiam)

test/lpytest/nodeposition2.lpy

@@ -0,0 +1,73 @@
+Axiom: Frame() Sweep(path,section,10,0.1,0.5,radius)
+
+derivation length: 1
+production:
+
+
+interpretation:
+
+
+endlsystem
+###### INITIALISATION ######
+
+__lpy_code_version__ = 1.1
+
+def __initialiseContext__(context):
+	scalars = [('default_scalar', 1, 0, 100), ('default_scalar2', 1, 0, 100), ('default_scalar3', 1, 0, 100)]
+	context["__scalars__"] = scalars
+	for n,v,mnv,mxv in scalars:
+		context[n] = v
+	import openalea.plantgl.all as pgl
+	radius = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(0, 0.98719, 1),(0.0357168, 0.407384, 1),(0.260088, 0.407384, 1),(0.260088, 0.949652, 1),(0.546428, 0.964524, 1),(0.555714, 0.249528, 1),(0.78476, 0.265004, 1),(0.828093, 0.942858, 1),(0.953572, 0.936943, 1),(1, 0.109243, 1)]) , 
+	    )
+	radius.name = "radius"
+	import openalea.plantgl.all as pgl
+	path = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(-0.5, 0, 1),(-0.218615, 0.164502, 1),(0.0238095, -0.290043, 1),(0.517316, 0.246753, 1)]) , 
+	    )
+	path.name = "path"
+	section = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(-0.5, 0, 1),(-0.331169, 0.333333, 1),(-0.166667, -0.155844, 1),(0.201299, 0.214286, 1),(0.5, 0, 1)]) , 
+	    )
+	section.name = "section"
+	import openalea.plantgl.all as pgl
+	parameter = pgl.NurbsPatch(	
+	    pgl.Point4Matrix([[(-0.0797013, -0.362725, -0.0718943, 1), (0.165875, -0.0593558, 0.0786184, 1), (-0.204907, 0.0787067, -0.105177, 1), (0.19717, 0.672553, 0.0853212, 1)], [(-0.0814571, -0.7365, 0.327935, 1), (0.284639, -0.469756, 0.556274, 1), (0, 0.166667, 0.333333, 1), (0.216553, 0.529145, 0.456017, 1)], [(0, -0.5, 0.666667, 1), (0, -0.166667, 0.666667, 1), (0, 0.166667, 0.666667, 1), (0, 0.5, 0.666667, 1)], [(-0.259848, -0.651558, 1.17402, 1), (-0.0401437, -0.224966, 1.32802, 1), (0, 0.166667, 1, 1), (0.340902, 0.64979, 1.19505, 1)]]) , 
+	    )
+	parameter.name = "parameter"
+	panel_0 = ({'active': False, 'visible': True, 'name': 'Panel 1'},[('Function',radius),('Curve2D',path),('Curve2D',section),('NurbsPatch',parameter)])
+	radius = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(0, 0.98719, 1),(0.0357168, 0.407384, 1),(0.260088, 0.407384, 1),(0.260088, 0.949652, 1),(0.546428, 0.964524, 1),(0.555714, 0.249528, 1),(0.78476, 0.265004, 1),(0.828093, 0.942858, 1),(0.953572, 0.936943, 1),(1, 0.109243, 1)]) , 
+	    )
+	radius.name = "radius"
+	path = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(-0.5, 0, 1),(-0.218615, 0.164502, 1),(0.0238095, -0.290043, 1),(0.517316, 0.246753, 1)]) , 
+	    )
+	path.name = "path"
+	section = pgl.NurbsCurve2D(	
+	    ctrlPointList = pgl.Point3Array([(-0.5, 0, 1),(-0.331169, 0.333333, 1),(-0.166667, -0.155844, 1),(0.201299, 0.214286, 1),(0.5, 0, 1)]) , 
+	    )
+	section.name = "section"
+	parameter_2 = pgl.NurbsPatch(	
+	    pgl.Point4Matrix([[(-0.0797013, -0.362725, -0.0718943, 1), (0.165875, -0.0593558, 0.0786184, 1), (-0.204907, 0.0787067, -0.105177, 1), (0.19717, 0.672553, 0.0853212, 1)], [(-0.0814571, -0.7365, 0.327935, 1), (0.284639, -0.469756, 0.556274, 1), (0, 0.166667, 0.333333, 1), (0.216553, 0.529145, 0.456017, 1)], [(0, -0.5, 0.666667, 1), (0, -0.166667, 0.666667, 1), (0, 0.166667, 0.666667, 1), (0, 0.5, 0.666667, 1)], [(-0.259848, -0.651558, 1.17402, 1), (-0.0401437, -0.224966, 1.32802, 1), (0, 0.166667, 1, 1), (0.340902, 0.64979, 1.19505, 1)]]) , 
+	    )
+	parameter_2.name = "parameter_2"
+	import openalea.plantgl.scenegraph.interpolated_profile as ip
+	parameter_3 = ip.InterpolatedProfile(interpolator=ip.CSplineMethod)
+	parameter_3.name = 'parameter_3'
+	parameter_3.set_param_range(0.0, 1.0)
+	section0 = ip.CrossSection(*[(-0.5, 0.0), (-0.1590227484703064, 0.27564427256584167), (0.19117572903633118, -0.084947317838668823), (0.5, 0.0)])
+	parameter_3.add_cross_section(0.0, section0)
+	section1 = ip.CrossSection(*[(-0.5, 0.0), (-0.28442138433456421, 0.23209185898303986), (0.33333333333333331, 0.0), (0.5, 0.0)])
+	parameter_3.add_cross_section(1.0, section1)
+	panel_1 = ({'active': True, 'visible': True, 'name': 'Panel 1 2'},[('Function',radius),('Curve2D',path),('Curve2D',section),('NurbsPatch',parameter_2),('InterpolatedProfile',parameter_3)])
+	parameterset = [panel_0,panel_1,]
+	context["__functions__"] = [('radius',radius),]
+	context["__curves__"] = [('path',path),('section',section),]
+	context["__parameterset__"] = parameterset
+	context["radius"] = pgl.QuantisedFunction(radius)
+	context["path"] = path
+	context["section"] = section
+	context["parameter_2"] = parameter_2
+	context["parameter_3"] = parameter_3

test/lpytest/sweep.lpy

@@ -0,0 +1,26 @@
+matched = False
+
+def StartEach():
+  global matched
+  matched = False
+
+def EndEach():
+  global matched
+  assert matched
+
+Axiom: I(0) [ I(1) [ I(2) I(3) ] I(4) ]
+
+
+derivation length: 1
+production:
+
+[ I(x) [ <  I(y) > I(z):
+   global matched
+   matched = True
+   assert (x,y,z) == (1,2,3)
+
+
+interpretation:
+
+
+endlsystem

test/lpytest/test_axialmatching.lpy

@@ -0,0 +1,15 @@
+def End(lstring,lscene):
+  faceset = lscene[0].geometry
+  assert faceset.indexList == [[1,2,3],[3,4,5],[0,1,3,5],[0,5,6,7],[7,8,9],[9,10,11],[7,9,11],[0,7,11]]
+    
+Axiom: +(90) BP F-F++F-F++F-F++F-F++F-F++F-F EP(True)
+#Axiom: -(90) BP F+F--F+F--F+F--F+F--F+F--F+F EP(True)
+
+derivation length: 1
+production:
+
+
+interpretation:
+
+
+endlsystem

test/test_comment.lpy test/lpytest/test_comment.lpy

@@ -0,0 +1,18 @@
+Axiom: A
+
+derivation length: 1
+production:
+
+A:
+    pass
+
+
+
+    produce A
+B : 
+    produce B
+    
+interpretation:
+
+
+endlsystem

test/test_complex_match.lpy test/lpytest/test_complex_match.lpy

@@ -0,0 +1,19 @@
+def EndEach(lstring):
+    assert len(lstring) == getIterationNb()+1
+    lstring += 'B'
+    global ok
+    ok = True
+    return lstring
+
+derivation length : 5
+
+ok = False
+
+def End():
+    assert ok == True
+    
+Axiom: A
+production:
+A --> A
+
+endlsystem