New Generate Modes (#250)

* feat : F1F2_VS_F1 and F1F2_VS_F2 modes added

* doc : document updated

* doc : CHANGELOG.md updated

* fix : tests updated

Author: sepandhaghighi

CHANGELOG.md

@@ -6,8 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 ### Added
-- 1 new generation mode
+- 3 new generation modes
 	1. `RANDOM`
+	2. `F1F2_VS_F1`
+	3. `F1F2_VS_F2`
 ### Changed
 - Elapsed time added to CLI
 - CLI bug fixed

README.md

@@ -123,7 +123,7 @@ Samila is a generative art generator written in Python, Samila lets you create i
 ```
 <img src="https://github.com/sepandhaghighi/samila/raw/master/otherfiles/images/10.png">	
 
-ℹ️ Supported modes : `F1_VS_F2`, `F2_VS_F1`, `F1_VS_INDEX`, `F2_VS_INDEX`, `INDEX_VS_F1`, `INDEX_VS_F2`, `F1_VS_X1`, `F1_VS_X2`, `F2_VS_X1`, `F2_VS_X2`, `X1_VS_F1`, `X1_VS_F2`, `X2_VS_F1`, `X2_VS_F2` and `RANDOM`
+ℹ️ Supported modes : `F1_VS_F2`, `F2_VS_F1`, `F1_VS_INDEX`, `F2_VS_INDEX`, `INDEX_VS_F1`, `INDEX_VS_F2`, `F1_VS_X1`, `F1_VS_X2`, `F2_VS_X1`, `F2_VS_X2`, `X1_VS_F1`, `X1_VS_F2`, `X2_VS_F1`, `X2_VS_F2`, `F1F2_VS_F1`, `F1F2_VS_F2` and `RANDOM`
 
 ℹ️ Default mode is `F1_VS_F2`
 

examples/demo.ipynb

@@ -102,7 +102,7 @@
    "source": [
     "We have the option to select from various generation modes.\n",
     "\n",
-    "ℹ️ The avaliable modes are `F1_VS_F2`, `F2_VS_F1`, `F1_VS_INDEX`, `F2_VS_INDEX`, `INDEX_VS_F1`, `INDEX_VS_F2`, `F1_VS_X1`, `F1_VS_X2`, `F2_VS_X1`, `F2_VS_X2`, `X1_VS_F1`, `X1_VS_F2`, `X2_VS_F1`, `X2_VS_F2` and `RANDOM`"
+    "ℹ️ The avaliable modes are `F1_VS_F2`, `F2_VS_F1`, `F1_VS_INDEX`, `F2_VS_INDEX`, `INDEX_VS_F1`, `INDEX_VS_F2`, `F1_VS_X1`, `F1_VS_X2`, `F2_VS_X1`, `F2_VS_X2`, `X1_VS_F1`, `X1_VS_F2`, `X2_VS_F1`, `X2_VS_F2`, `F1F2_VS_F1`, `F1F2_VS_F2` and `RANDOM`"
    ]
   },
   {

samila/genimage.py

@@ -145,6 +145,12 @@ def generate(
                 elif self.generate_mode == GenerateMode.X2_VS_F2.value:
                     data1_ = point[1]
                     data2_ = self.function2(point[0], point[1]).real
+                elif self.generate_mode == GenerateMode.F1F2_VS_F1.value:
+                    data1_ = self.function1(point[0], point[1]).real * self.function2(point[0], point[1]).real
+                    data2_ = self.function1(point[0], point[1]).real
+                elif self.generate_mode == GenerateMode.F1F2_VS_F2.value:
+                    data1_ = self.function1(point[0], point[1]).real * self.function2(point[0], point[1]).real
+                    data2_ = self.function2(point[0], point[1]).real
                 self.data1.append(data1_)
                 self.data2.append(data2_)
             except Exception:

samila/params.py

@@ -92,6 +92,8 @@ class GenerateMode(Enum):
     X1_VS_F2 = "x1_vs_f2"
     X2_VS_F1 = "x2_vs_f1"
     X2_VS_F2 = "x2_vs_f2"
+    F1F2_VS_F1 = "f1f2_vs_f1"
+    F1F2_VS_F2 = "f1f2_vs_f2"
     RANDOM = "random"
 
 

test/overall_test.py

@@ -414,6 +414,12 @@
 >>> g.generate(start=-2*math.pi, step=0.1, stop=math.pi/2, mode=GenerateMode.X2_VS_F2)
 >>> g.generate_mode == GenerateMode.X2_VS_F2.value
 True
+>>> g.generate(start=-2*math.pi, step=0.1, stop=math.pi/2, mode=GenerateMode.F1F2_VS_F1)
+>>> g.generate_mode == GenerateMode.F1F2_VS_F1.value
+True
+>>> g.generate(start=-2*math.pi, step=0.1, stop=math.pi/2, mode=GenerateMode.F1F2_VS_F2)
+>>> g.generate_mode == GenerateMode.F1F2_VS_F2.value
+True
 >>> os.remove("test.png")
 >>> os.remove("test2.png")
 >>> os.remove("data.json")