From a7cb71541bc00c5b7e06c95f88566f0c2b1f7562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulski?= <micdul@st.amu.edu.pl>
Date: Thu, 9 May 2019 11:39:36 +0000
Subject: [PATCH] Update 'populus_nigra_italica.lpy'

---
 populus_nigra_italica.lpy | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/populus_nigra_italica.lpy b/populus_nigra_italica.lpy
index 7f75b10..8821e10 100644
--- a/populus_nigra_italica.lpy
+++ b/populus_nigra_italica.lpy
@@ -1,16 +1,30 @@
+import random
+
+a = 50
+
 def Start():
    #random.seed(150)
    pass
    
-Axiom: _(0.3)@GsG(0.5)A(1)
-derivation length: 30
+Axiom: _(0.3)@GsG(0.5)A(1,1.0)
+derivation length: 50
 production:
-A(x) :
-  produce[-(30)F(1)B(1)]/(75)F(0.5)A(x+1)
+A(x,k) :
+  if x >= a-20:
+    produce [-(a-x)F(1,0.05+0.25/k)C(1,k)]/(75)F(0.7,0.05+0.25/k)A(x+1,k+0.1)
+  else:
+    produce[-(30)F(1,0.05+0.25/k)B(1,k)]/(75)F(0.5,0.05+0.25/k)A(x+1,k+0.1)
 
-B(x):
+B(x,k):
   if x <= 5:
-    produce [^(30)F(1,0.05+0.25/x)Leaf(1)][&(30)F(1,0.05+0.25/x)Leaf(1)]F(1,0.05+0.25/x)B(x+1)
+    r1 = random.random()
+    r2 = random.random()    
+    produce [^(r1*50)F(1,0.05+0.25/k)-(20)Leaf(1)][&(r2*50)F(1,0.05+0.25/k)-(20)Leaf(1)]F(1,0.05+0.25/k)[-(20)Leaf(1)]B(x+1,k+1)
+C(x,k):
+  if x <= 5:
+    r1 = random.random()
+    r2 = random.random()    
+    produce [^(r1*50)F(1,0.05+0.25/k)-(20)Leaf(1)]F(1,0.05+0.25/k)[-(20)Leaf(1)]C(x+1,k+1)
 
 Leaf(x):
   produce ~l(1)