Skip to content

Commit 4d93fc9

Browse files
authoredJul 23, 2019
Merge pull request #67 from ayrna/fix_links
Fix links
2 parents d2c224d + e6928ef commit 4d93fc9

8 files changed

+61
-49
lines changed
 

‎README.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
![ORCA logo](doc/orca_small.png)
55
<!-- TOC depthFrom:1 depthTo:6 withLinks:1 updateOnSave:1 orderedList:1 -->
66

7-
1. [ORCA](#orca)
8-
2. [Cite ORCA](#cite-orca)
9-
3. [Installation, tutorials and documentation](#installation-tutorials-and-documentation)
10-
4. [Methods](#methods)
11-
1. [Ordinal regression algorithms](#ordinal-regression-algorithms)
12-
2. [Partial order methods](#partial-order-methods)
13-
3. [Nominal methods](#nominal-methods)
14-
5. [Performance metrics](#performance-metrics)
15-
6. [Utilities, classes and scripts](#utilities-classes-and-scripts)
16-
7. [Datasets](#datasets)
17-
8. [Experiments parallelization with HTCondor](#experiments-parallelization-with-htcondor)
18-
9. [External software](#external-software)
19-
10. [Other contributors](#other-contributors)
20-
11. [References](#references)
7+
- [ORCA](#orca)
8+
- [Cite ORCA](#cite-orca)
9+
- [Installation, tutorials and documentation](#installation-tutorials-and-documentation)
10+
- [Methods included](#methods-included)
11+
- [Ordinal regression algorithms](#ordinal-regression-algorithms)
12+
- [Partial order methods](#partial-order-methods)
13+
- [Nominal methods](#nominal-methods)
14+
- [Performance metrics](#performance-metrics)
15+
- [Utilities, classes and scripts](#utilities-classes-and-scripts)
16+
- [Datasets](#datasets)
17+
- [Experiments parallelization with HTCondor](#experiments-parallelization-with-htcondor)
18+
- [External software](#external-software)
19+
- [Other contributors](#other-contributors)
20+
- [References](#references)
2121

2222
<!-- /TOC -->
2323

@@ -67,7 +67,7 @@ The documentation can be found in the [doc](doc) folder and includes:
6767
1. A first *'how to' tutorial* ([Jupyter Notebook](doc/orca_tutorial_1.ipynb), [MD](doc/orca_tutorial_1.md)) to get started with ORCA.
6868
1. A specific *tutorial for naive approaches and decomposition methods* ([Jupyter Notebook](doc/orca_tutorial_2.ipynb), [MD](doc/orca_tutorial_2.md)) covering the different considerations needed for these methods.
6969
1. A *tutorial for threshold models* ([Jupyter Notebook](doc/orca_tutorial_3.ipynb), [MD](doc/orca_tutorial_3.md)) examining the differences of these models.
70-
- A guide about how to [paralelize ORCA experiments](doc/orca_parallel.md).
70+
- A guide about how to [parallelize ORCA experiments](doc/orca_parallel.md).
7171
- Some notes about the [use of ORCA with HTCondor](doc/orca_condor.md).
7272
- An example about how to [add a new method to ORCA](doc/orca_addmethod.md).
7373
- An additional branch that includes other methods ready to use in ORCA. Visit [orca-extra-methods branch](https://github.com/ayrna/orca/tree/orca-extra-methods).
@@ -125,7 +125,7 @@ The [measures](src/Measures) folder contains the MATLAB classes for the metrics
125125
- [Experiment.m](src/Utils/Experiment.m): Class that runs the different experiments.
126126
- [Utilities.m](src/Utils/Utilities.m): Class that pre-process the experiment files, run the different algorithms and produces the results.
127127
- [runtests_single.m](src/runtests_single.m): Script to run all the methods using the ORCA API. Reference performance is compared with `toy` dataset in order to check that the installation is correct.
128-
- [runtestscv.m](src/runtestscv.m): This script runs full experiment tests using the ORCA configuration files to describe experiments.
128+
- [runtests_cv.m](src/runtests_cv.m): This script runs full experiment tests using the ORCA configuration files to describe experiments.
129129

130130
# Datasets
131131

‎doc/orca_quick_install.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ If you prefer to build `mex` files from the Linux shell, you can use standard `m
5959

6060
## Installation testing
6161

62-
We provide a set of basic tests to for checking that all the algorithms work, both using ORCA's API and experiment scripts (see [tutorial](orca_tutorial_1_md) for more information).
62+
We provide a set of basic tests to for checking that all the algorithms work, both using ORCA's API and experiment scripts (see [tutorial](orca_tutorial_1.md) for more information).
6363

6464
The way to run the tests checking the API (see [single test scripts](../src/tests/singletests/)) is the following (running time is ~12 seconds):
6565

@@ -82,8 +82,7 @@ All tests ended successfully
8282
To run the tests checking the experiment scripts (running time is ~123 seconds):
8383

8484
```MATLAB
85-
>> cd src/
86-
>> runtestscv
85+
>> runtests_cv
8786
...
8887
Running experiment exp-svr-real1-toy-1
8988
Processing Experiments/exp-2017-11-16-13-59-1/exp-svr-real1-toy-1
@@ -98,7 +97,7 @@ If any of these tests fail, please read the [detailed installation guide](orca_i
9897

9998
## Use ORCA as a toolbox
10099

101-
The first of three tutorials cvers the basic use of ORCA as a toolbox but also as an experimental framework: *'how to' tutorial* ([HTML](doc/orca_tutorial_1.html), [Jupyter Notebook](doc/orca_tutorial_1.ipynb), [MD](doc/orca_tutorial_1.md)).
100+
The first of three tutorials covers the basic use of ORCA as a toolbox but also as an experimental framework: *'how to' tutorial* ([Jupyter Notebook](orca_tutorial_1.ipynb), [MD](orca_tutorial_1.md)).
102101

103102
For instance, to use ORCA as a toolbox:
104103

‎doc/orca_tutorial_1.ipynb

+18-5
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@
558558
"cell_type": "markdown",
559559
"metadata": {},
560560
"source": [
561-
"The whole example is available at [exampleProjections.m](../code-examples/exampleProjections.m)."
561+
"The whole example is available at [exampleProjections.m](../src/code-examples/exampleProjections.m)."
562562
]
563563
},
564564
{
@@ -600,7 +600,7 @@
600600
"cell_type": "markdown",
601601
"metadata": {},
602602
"source": [
603-
"The whole example is available at [exampleProjectionsThresholds.m](../code-examples/exampleProjectionsThresholds.m)."
603+
"The whole example is available at [exampleProjectionsThresholds.m](../src/code-examples/exampleProjectionsThresholds.m)."
604604
]
605605
},
606606
{
@@ -757,7 +757,7 @@
757757
"\n",
758758
"---\n",
759759
"\n",
760-
"***Exercise 4***: train classifiers for both `ERA` and `ESL` datasets, using the same experimental design you used in the [experiment section](orca-tutorial.md#launch-experiments-through-ini-files). Compare the results obtained for both datasets. Generate bar plots for comparing accuracy and AMAE. Which one is better classified? Which one is better ordered?\n",
760+
"***Exercise 4***: train classifiers for both `ERA` and `ESL` datasets, using the same experimental design you used in the [experiment section](orca_tutorial_1.md#launch-experiments-through-ini-files). Compare the results obtained for both datasets. Generate bar plots for comparing accuracy and AMAE. Which one is better classified? Which one is better ordered?\n",
761761
"\n",
762762
"---\n",
763763
"\n",
@@ -796,12 +796,25 @@
796796
},
797797
{
798798
"text": "MetaKernel Magics",
799-
"url": "https://metakernel.readthedocs.io/en/latest/source/README.html"
799+
"url": "https://github.com/calysto/metakernel/blob/master/metakernel/magics/README.md"
800800
}
801801
],
802802
"mimetype": "text/x-octave",
803803
"name": "octave",
804-
"version": "4.4.1"
804+
"version": "4.2.1"
805+
},
806+
"toc": {
807+
"base_numbering": 1,
808+
"nav_menu": {},
809+
"number_sections": true,
810+
"sideBar": true,
811+
"skip_h1_title": false,
812+
"title_cell": "Table of Contents",
813+
"title_sidebar": "Contents",
814+
"toc_cell": false,
815+
"toc_position": {},
816+
"toc_section_display": true,
817+
"toc_window_display": false
805818
}
806819
},
807820
"nbformat": 4,

‎doc/orca_tutorial_1.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,13 @@ Utilities.runExperiments('tutorial/config-files/pom.ini')
168168
Running experiment exp-pom-tutorial-toy-8.ini
169169
Running experiment exp-pom-tutorial-toy-9.ini
170170
Calculating results...
171-
Experiments/exp-2019-5-6-18-34-3/Results/pasture-pom-tutorial/dataset
172-
Experiments/exp-2019-5-6-18-34-3/Results/tae-pom-tutorial/dataset
173-
Experiments/exp-2019-5-6-18-34-3/Results/toy-pom-tutorial/dataset
174-
Experiments/exp-2019-5-6-18-34-3/Results/pasture-pom-tutorial/dataset
175-
Experiments/exp-2019-5-6-18-34-3/Results/tae-pom-tutorial/dataset
176-
Experiments/exp-2019-5-6-18-34-3/Results/toy-pom-tutorial/dataset
177-
ans = Experiments/exp-2019-5-6-18-34-3
171+
Experiments/exp-2019-7-23-10-53-40/Results/pasture-pom-tutorial/dataset
172+
Experiments/exp-2019-7-23-10-53-40/Results/tae-pom-tutorial/dataset
173+
Experiments/exp-2019-7-23-10-53-40/Results/toy-pom-tutorial/dataset
174+
Experiments/exp-2019-7-23-10-53-40/Results/pasture-pom-tutorial/dataset
175+
Experiments/exp-2019-7-23-10-53-40/Results/tae-pom-tutorial/dataset
176+
Experiments/exp-2019-7-23-10-53-40/Results/toy-pom-tutorial/dataset
177+
ans = Experiments/exp-2019-7-23-10-53-40
178178

179179

180180
As can be observed, ORCA analyses all the files included in the folder of the dataset, where training and test partitions are included (a pair of files `train_dataset.X` and `test_dataset.X` for each dataset, where `X` is the number of partition). For each partition, a model is trained on training data and tested on test data.
@@ -199,13 +199,13 @@ Utilities.runExperiments('tutorial/config-files/svc1v1-3holdout.ini')
199199
Running experiment exp-svorim-mae-tutorial-toy-2.ini
200200
Running experiment exp-svorim-mae-tutorial-toy-3.ini
201201
Calculating results...
202-
Experiments/exp-2019-5-6-18-34-21/Results/pasture-svorim-mae-tutorial/dataset
203-
Experiments/exp-2019-5-6-18-34-21/Results/tae-svorim-mae-tutorial/dataset
204-
Experiments/exp-2019-5-6-18-34-21/Results/toy-svorim-mae-tutorial/dataset
205-
Experiments/exp-2019-5-6-18-34-21/Results/pasture-svorim-mae-tutorial/dataset
206-
Experiments/exp-2019-5-6-18-34-21/Results/tae-svorim-mae-tutorial/dataset
207-
Experiments/exp-2019-5-6-18-34-21/Results/toy-svorim-mae-tutorial/dataset
208-
ans = Experiments/exp-2019-5-6-18-34-21
202+
Experiments/exp-2019-7-23-10-54-2/Results/pasture-svorim-mae-tutorial/dataset
203+
Experiments/exp-2019-7-23-10-54-2/Results/tae-svorim-mae-tutorial/dataset
204+
Experiments/exp-2019-7-23-10-54-2/Results/toy-svorim-mae-tutorial/dataset
205+
Experiments/exp-2019-7-23-10-54-2/Results/pasture-svorim-mae-tutorial/dataset
206+
Experiments/exp-2019-7-23-10-54-2/Results/tae-svorim-mae-tutorial/dataset
207+
Experiments/exp-2019-7-23-10-54-2/Results/toy-svorim-mae-tutorial/dataset
208+
ans = Experiments/exp-2019-7-23-10-54-2
209209
Setting up experiments...
210210
Running experiment exp-svc1v1-mae-tutorial-pasture-1.ini
211211
Running experiment exp-svc1v1-mae-tutorial-pasture-2.ini
@@ -217,13 +217,13 @@ Utilities.runExperiments('tutorial/config-files/svc1v1-3holdout.ini')
217217
Running experiment exp-svc1v1-mae-tutorial-toy-2.ini
218218
Running experiment exp-svc1v1-mae-tutorial-toy-3.ini
219219
Calculating results...
220-
Experiments/exp-2019-5-6-18-34-27/Results/pasture-svc1v1-mae-tutorial/dataset
221-
Experiments/exp-2019-5-6-18-34-27/Results/tae-svc1v1-mae-tutorial/dataset
222-
Experiments/exp-2019-5-6-18-34-27/Results/toy-svc1v1-mae-tutorial/dataset
223-
Experiments/exp-2019-5-6-18-34-27/Results/pasture-svc1v1-mae-tutorial/dataset
224-
Experiments/exp-2019-5-6-18-34-27/Results/tae-svc1v1-mae-tutorial/dataset
225-
Experiments/exp-2019-5-6-18-34-27/Results/toy-svc1v1-mae-tutorial/dataset
226-
ans = Experiments/exp-2019-5-6-18-34-27
220+
Experiments/exp-2019-7-23-10-54-11/Results/pasture-svc1v1-mae-tutorial/dataset
221+
Experiments/exp-2019-7-23-10-54-11/Results/tae-svc1v1-mae-tutorial/dataset
222+
Experiments/exp-2019-7-23-10-54-11/Results/toy-svc1v1-mae-tutorial/dataset
223+
Experiments/exp-2019-7-23-10-54-11/Results/pasture-svc1v1-mae-tutorial/dataset
224+
Experiments/exp-2019-7-23-10-54-11/Results/tae-svc1v1-mae-tutorial/dataset
225+
Experiments/exp-2019-7-23-10-54-11/Results/toy-svc1v1-mae-tutorial/dataset
226+
ans = Experiments/exp-2019-7-23-10-54-11
227227

228228

229229
Once the experiments are finished, the corresponding results can be found in the `Experiments` subfolder, as described in the [corresponding section](#Experimental-results-and-reports) of this tutorial.
@@ -633,7 +633,7 @@ amae2 = AMAE.calculateMetric(test.targets,info2.predictedTest)
633633
amae2 = 0.11670
634634

635635

636-
The whole example is available at [exampleProjections.m](../code-examples/exampleProjections.m).
636+
The whole example is available at [exampleProjections.m](../src/code-examples/exampleProjections.m).
637637

638638
### Visualizing projections and decision thresholds
639639

@@ -666,7 +666,7 @@ hold off;
666666
![png](orca_tutorial_1_files/orca_tutorial_1_38_0.png)
667667

668668

669-
The whole example is available at [exampleProjectionsThresholds.m](../code-examples/exampleProjectionsThresholds.m).
669+
The whole example is available at [exampleProjectionsThresholds.m](../src/code-examples/exampleProjectionsThresholds.m).
670670

671671
## Using ORCA with your own datasets
672672

@@ -842,7 +842,7 @@ The source code of this example is in [exampleERAHHoldout.m](../src/code-example
842842

843843
---
844844

845-
***Exercise 4***: train classifiers for both `ERA` and `ESL` datasets, using the same experimental design you used in the [experiment section](orca-tutorial.md#launch-experiments-through-ini-files). Compare the results obtained for both datasets. Generate bar plots for comparing accuracy and AMAE. Which one is better classified? Which one is better ordered?
845+
***Exercise 4***: train classifiers for both `ERA` and `ESL` datasets, using the same experimental design you used in the [experiment section](orca_tutorial_1.md#launch-experiments-through-ini-files). Compare the results obtained for both datasets. Generate bar plots for comparing accuracy and AMAE. Which one is better classified? Which one is better ordered?
846846

847847
---
848848

-89 Bytes
Loading
-355 Bytes
Loading
285 Bytes
Loading
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.