Merge branch 'main' into css-functionSelection

AaltoPML · Sep 22, 2023 · 9d4393f · 9d4393f
2 parents 0840e2e + 4e9889e
commit 9d4393f
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -97,9 +97,9 @@ Install the dependencies into a [virtual environment](https://docs.python.org/3/
 ```bash
 python3 -m venv .venv && source .venv/bin/activate && python3 -m pip install -U pip && python3 -m pip install -r sphinx-requirements.txt
 ```
-Alternatively, , install into a [conda environment](https://conda.io/projects/conda/en/latest/user-guide/getting-started.html)
+Alternatively, install into a [conda environment](https://conda.io/projects/conda/en/latest/user-guide/getting-started.html)
 ```bash
-conda create --file sphinx-environment.yml && conda activate sphinx-env
+conda env create --file sphinx-environment.yml && conda activate sphinx-env
 ```
 
 Build the documentation with

diff --git a/dev-environment.yml b/dev-environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.10
-  - gcc
+  - c-compiler
   - pip
   - pip:
     - .[dev]
diff --git a/environment.yml b/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.10
-  - gcc
+  - c-compiler
   - pip
   - pip:
     - .
diff --git a/src/vai_lab/examples/xml_files/SVR_demo.xml b/src/vai_lab/examples/xml_files/SVR_demo.xml
@@ -24,6 +24,9 @@
         <coordinates>
             [(350.0, 350.0), 2, {0: 'd0-u2'}]
         </coordinates>
+        <inputdata>
+            <X module="Initialiser" />
+        </inputdata>
         <plugin type="SVR">
             <options>
                 <C>

diff --git a/src/vai_lab/examples/xml_files/random_forest_class_demo.xml b/src/vai_lab/examples/xml_files/random_forest_class_demo.xml
@@ -12,6 +12,9 @@
             <X_test file="C:/Users/sevisal/Documents/GitHub/ai-assisted-design-framework/src/vai_lab/examples/supervised_classification/X_tst.csv" />
             <Y_test file="C:/Users/sevisal/Documents/GitHub/ai-assisted-design-framework/src/vai_lab/examples/supervised_classification/Y_tst.csv" />
         </inputdata>
+        <coordinates>
+            [(350.0,50),0,{}]
+        </coordinates>
     </Initialiser>
     <DataProcessing name="Data Processing">
         <inputdata>
@@ -41,6 +44,9 @@
                 </options>
             </method>
         </plugin>
+        <inputdata>
+            <X module="Initialiser" />
+        </inputdata>
     </DataProcessing>
     <Modelling name="Modelling">
         <inputdata>

diff --git a/src/vai_lab/examples/xml_files/ridge-scalar-ridge_demo.xml b/src/vai_lab/examples/xml_files/ridge-scalar-ridge_demo.xml
@@ -51,6 +51,9 @@
                 </options>
             </method>
         </plugin>
+        <inputdata>
+            <X module="Initialiser" />
+        </inputdata>
     </Modelling>
     <DataProcessing name="Data Processing">
         <inputdata>
@@ -63,6 +66,9 @@
         <coordinates>
             [(450, 219), 3, {2: 'r2-l3'}]
         </coordinates>
+        <inputdata>
+            <X module="Modelling" />
+        </inputdata>
         <plugin type="StandardScaler">
             <options />
             <method type="fit">
@@ -92,6 +98,9 @@
         <coordinates>
             [(350.0, 350.0), 4, {3: 'd3-u4'}]
         </coordinates>
+        <inputdata>
+            <X module="Data Processing" />
+        </inputdata>
         <plugin type="RidgeRegression">
             <options />
             <method type="fit">

diff --git a/...examples/xml_files/user_feedback_demo.xml → ...xamples/xml_files/user_feedback_demo2.xml b/...examples/xml_files/user_feedback_demo.xml → ...xamples/xml_files/user_feedback_demo2.xml
@@ -1,15 +1,15 @@
 <pipeline>
     <Initialiser name="Initialiser">
+        <inputdata>
+            <X folder="./examples/image_classification/training_images/" />
+            <Y file="./examples/image_classification/Y_data.csv" />
+        </inputdata>
         <relationships>
             <child name="User Interaction" />
         </relationships>
         <coordinates>
             [(350.0, 50), 0, {}]
         </coordinates>
-        <inputdata>
-            <X file="./examples/image_classification/training_images/" />
-            <Y file="./examples/image_classification/Y_data.csv" />
-        </inputdata>
     </Initialiser>
     <UserInteraction name="User Interaction">
         <inputdata>
@@ -22,8 +22,7 @@
         <coordinates>
             [(350.0, 350.0), 2, {0: 'd0-u2'}]
         </coordinates>
-        <plugin type="ManualInput">
-        </plugin>
+        <plugin type="ManualInput" />
     </UserInteraction>
     <Output name="Output">
         <inputdata>
@@ -36,14 +35,12 @@
             [(350.0, 650), 1, {2: 'd2-u1'}]
         </coordinates>
         <plugin type="Output">
-            <options>
-                <outdata>
-                    User Interaction
-                </outdata>
-                <outpath>
-                     .\examples\results\output.pkl
-                </outpath>
-            </options>
+            <outdata>
+                User Interaction
+            </outdata>
+            <outpath>
+                 .\examples\results\output.pkl
+            </outpath>
         </plugin>
     </Output>
 </pipeline>