kanaka/mal
1
1
Fork 0
mirror of https://github.com/kanaka/mal.git synced 2024-09-11 13:55:55 +03:00
Code Issues Projects Releases Wiki Activity

Matlab: update to Octave 4.2.1

Browse Source 
Make Octave the primary in the README description and add instructions
for direct Octave execution.
This commit is contained in:
Joel Martin 2017-09-11 16:45:53 -05:00
parent 7e9e7fbd8c
commit 4bb2ab37be
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -46,7 +46,7 @@ Mal is implemented in 68 languages:
* Lua
* GNU Make
* mal itself
* MATLAB
* Matlab (GNU Octave and MATLAB)
* [miniMAL](https://github.com/kanaka/miniMAL)
* Nim
* Object Pascal
@ -652,18 +652,19 @@ make
./stepX_YYY
```
### MATLAB
### MatLab (GNU Octave and MATLAB)
The MATLAB implementation of mal has been tested with MATLAB version
R2014a on Linux. Note that MATLAB is a commercial product. It should
be fairly simple to support GNU Octave once it support classdef object
syntax.
The MatLab implementation has been tested with GNU Octave 4.2.1.
It has also been tested with MATLAB version R2014a on Linux. Note that
MATLAB is a commercial product.
```
cd matlab
./stepX_YYY
octave -q --no-gui --no-history --eval "stepX_YYY();quit;"
matlab -nodisplay -nosplash -nodesktop -nojvm -r "stepX_YYY();quit;"
# OR with command line arguments
octave -q --no-gui --no-history --eval "stepX_YYY('arg1','arg2');quit;"
matlab -nodisplay -nosplash -nodesktop -nojvm -r "stepX_YYY('arg1','arg2');quit;"
```

7
matlab/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:vivid
FROM ubuntu:xenial
MAINTAINER Joel Martin <github@martintribe.org>
##########################################################
@ -22,8 +22,8 @@ WORKDIR /mal
##########################################################
# Java and maven deps
RUN apt-get -y install openjdk-7-jdk
RUN apt-get -y install maven2
RUN apt-get -y install openjdk-8-jdk
RUN apt-get -y install maven
ENV MAVEN_OPTS -Duser.home=/mal
# GNU Octave
@ -32,3 +32,4 @@ RUN apt-get -y install software-properties-common && \
apt-get -y update && \
apt-get -y install octave
ENV HOME /mal

2
matlab/run
View File

@ -9,5 +9,5 @@ fi
if [ -n "$USE_MATLAB" ] ; then
exec matlab -nodisplay -nosplash -nodesktop -nojvm -r "${STEP:-stepA_mal}($args);quit;"
else
exec octave --no-gui --no-history -q --traditional --eval "${STEP:-stepA_mal}($args);quit;"
exec octave -q --no-gui --no-history --eval "${STEP:-stepA_mal}($args);quit;"
fi