Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Documentation links #3897

Merged
merged 1 commit into from
Jun 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Orange/widgets/evaluate/owtestlearners.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class State(enum.Enum):


class OWTestLearners(OWWidget):
name = "Test & Score"
name = "Test and Score"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changes the name of the widget in Orange. Which means all schemas that had "Test & Score" before could fail. Please check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works (I checked on an example workflow).

description = "Cross-validation accuracy estimation."
icon = "icons/TestLearners1.svg"
priority = 100
Expand Down
4 changes: 2 additions & 2 deletions doc/visual-programming/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Data
widgets/data/mergedata
widgets/data/outliers
widgets/data/preprocess
widgets/data/transform
widgets/data/applydomain
widgets/data/purgedomain
widgets/data/rank
widgets/data/correlations
Expand Down Expand Up @@ -120,7 +120,7 @@ Unsupervised
widgets/unsupervised/distancefile
widgets/unsupervised/savedistancematrix
widgets/unsupervised/hierarchicalclustering
widgets/unsupervised/kmeansclustering
widgets/unsupervised/kmeans
widgets/unsupervised/louvainclustering
widgets/unsupervised/mds
widgets/unsupervised/tsne
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Transform
=========
Apply Domain
============

Given dataset and preprocessor transforms the dataset.

Expand All @@ -12,9 +12,9 @@ Given dataset and preprocessor transforms the dataset.

- Transformed Data: transformed dataset

**Transform** maps new data into a transformed space. For example, if we transform some data with PCA and wish to observe new data in the same space, we can use transform to map the new data into the PCA space created from the original data.
**Apply Domain** maps new data into a transformed space. For example, if we transform some data with PCA and wish to observe new data in the same space, we can use transform to map the new data into the PCA space created from the original data.

![](images/Transform.png)
![](images/ApplyDomain.png)

Widget accepts new data on the input and a preprocessor that was used to transform the old data.

Expand All @@ -23,10 +23,10 @@ Example

We will use iris data from the [File](../data/file.md) widget for this example. To create two separate data sets, we will use [Select Rows](../data/selectrows.md) and set the condition to *iris is one of iris-setosa, iris-versicolor*. This will output a data set with a 100 rows, half of them belonging to iris-setosa class and the other half to iris-versicolor.

We will transform the data with [PCA](../unsupervised/PCA.md) and select the first two components, which explain 96% of variance. Now, we would like to apply the same preprocessing on the 'new' data, that is the remaining 50 iris virginicas. Send the unused data from **Select Rows** to **Transform**. Make sure to use the *Unmatched Data* output from **Select Rows** widget. Then add the *Preprocessor* output from **PCA**.
We will transform the data with [PCA](../unsupervised/PCA.md) and select the first two components, which explain 96% of variance. Now, we would like to apply the same preprocessing on the 'new' data, that is the remaining 50 iris virginicas. Send the unused data from **Select Rows** to **Apply Domain**. Make sure to use the *Unmatched Data* output from **Select Rows** widget. Then add the *Preprocessor* output from **PCA**.

**Transform** will apply the preprocessor to the new data and output it. To add the new data to the old data, use [Concatenate](../data/concatenate.md). Use *Transformed Data* output from **PCA** as *Primary Data* and *Transformed Data* from **Transform** as *Additional Data*.
**Apply Domain** will apply the preprocessor to the new data and output it. To add the new data to the old data, use [Concatenate](../data/concatenate.md). Use *Transformed Data* output from **PCA** as *Primary Data* and *Transformed Data* from **Apply Domain** as *Additional Data*.

Observe the results in a [Data Table](../data/datatable.md) or in a [Scatter Plot](../visualize/scatterplot.md) to see the new data in relation to the old one.

![](images/Transform-Example.png)
![](images/ApplyDomain-Example.png)
2 changes: 1 addition & 1 deletion doc/visual-programming/source/widgets/data/paintdata.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ The widget supports the creation of a new dataset by visually placing data point
Example
-------

In the example below, we have painted a dataset with 4 classes. Such dataset is great for demonstrating k-means and hierarchical clustering methods. In the screenshot, we see that [k-Means](../unsupervised/kmeansclustering.md), overall, recognizes clusters better than [Hierarchical Clustering](../unsupervised/hierarchicalclustering.md). It returns a score rank, where the best score (the one with the highest value) means the most likely number of clusters. Hierarchical clustering, however, doesn’t group the right classes together. This is a great tool for learning and exploring statistical concepts.
In the example below, we have painted a dataset with 4 classes. Such dataset is great for demonstrating k-means and hierarchical clustering methods. In the screenshot, we see that [k-Means](../unsupervised/kmeans.md), overall, recognizes clusters better than [Hierarchical Clustering](../unsupervised/hierarchicalclustering.md). It returns a score rank, where the best score (the one with the highest value) means the most likely number of clusters. Hierarchical clustering, however, doesn’t group the right classes together. This is a great tool for learning and exploring statistical concepts.

![](images/PaintData-Example.png)
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Predictions
===========
Confusion Matrix
================

Shows proportions between the predicted and actual class.

Expand Down