Skip to content
Snippets Groups Projects

Add fallback implementation for contains and splitlines functions.

Merged Add fallback implementation for contains and splitlines functions.
DoraK/dynare:master into master
2 unresolved threads
Merged Dóra Kocsis requested to merge DoraK/dynare:master into master
2 unresolved threads

Merge request reports

Pipeline #2333 passed

Stage: build
Stage: test_and_pkg

Pipeline passed for 4c49eddb on DoraK:master

Approval is optional

Merged by Sébastien VillemotSébastien Villemot 5 years ago (Nov 13, 2019 1:24pm UTC)

Merge details

  • Changes merged into master with d6e0ffd1.
  • Did not delete the source branch.
  • Auto-merge enabled

Pipeline #2334 passed

Stage: build
Stage: test_and_pkg
Stage: deploy

Pipeline passed for d6e0ffd1 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
matlab/dynare_config.m
125 127 p{end+1} = '/missing/strjoin';
126 128 end
127 129
130 % contains and splitlines are missing in Octave < 5.1 and MATLAB < R2016b
131 if (isoctave && octave_ver_less_than('5.1')) || (~isoctave && matlab_ver_less_than('9.1'))
132 p{end+1} = '/missing/contains';
  • Sébastien Villemot
    Sébastien Villemot @sebastien started a thread on an outdated change in commit a5e93e92
    • matlab/missing/splitlines/splitlines.m 0 → 100644
    7 % This file is part of Dynare.
    8 %
    9 % Dynare is free software: you can redistribute it and/or modify
    10 % it under the terms of the GNU General Public License as published by
    11 % the Free Software Foundation, either version 3 of the License, or
    12 % (at your option) any later version.
    13 %
    14 % Dynare is distributed in the hope that it will be useful,
    15 % but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    17 % GNU General Public License for more details.
    18 %
    19 % You should have received a copy of the GNU General Public License
    20 % along with Dynare. If not, see <http://www.gnu.org/licenses/>.
    21
    22 assert(ischar(string) && ndims(string)==2 && size(string,1)<=1, 'The first arugment has to be a row char array!');
  • Dóra Kocsis added 1 commit

    added 1 commit

    • 4c49eddb - Add fallback implementation for contains and splitlines functions.

    Compare with previous version

  • Sébastien Villemot enabled an automatic merge when the pipeline for 4c49eddb succeeds

    enabled an automatic merge when the pipeline for 4c49eddb succeeds

  • Sébastien Villemot merged

    merged

  • Sébastien Villemot mentioned in commit d6e0ffd1

    mentioned in commit d6e0ffd1

    • Please register or sign in to reply