Mercurial > repos > public > sbplib

annotate SolutionFile.m @ 32:ddfb98209aa2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a bunch of problems regarding convergence and saving solutions
author Jonatan Werpers <jonatan@werpers.com>
date Tue, 29 Sep 2015 09:22:22 +0200
parents 986e3efd8543
children 61367018c46f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
1 classdef SolutionFile < handle
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
2 properties
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
3 filename
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
4 matfile
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
5 keys % Cell array of keys. Each key is a structure
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6 % entries
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
7 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
8
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
9 methods
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
10 function obj = SolutionFile(filename)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
11
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
12 obj.filename = filename;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
13
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
14 is_new_file = ~exist(filename,'file');
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
15
32
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
16 % obj.matfile = matfile(filename,'Writable',true);
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
17 fprintf('MATLAB SUCKS!!!!\n')
9
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
18
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
19 if is_new_file
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
20 obj.matfile.keys = {};
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
21 obj.matfile.entries = {};
32
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
22 else
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
23 matObj = matfile(filename,'Writable',true);
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
24 obj.matfile.keys = matObj.keys;
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
25 obj.matfile.entries = matObj.entries;
9
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
26 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
27
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
28 obj.keys = obj.matfile.keys;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
29
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
30 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
31
32
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
32 function stupidSave(obj)
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
33 matObj = matfile(obj.filename,'Writable',true);
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
34
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
35 keys = obj.matfile.keys;
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
36 entries = obj.matfile.entries;
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
37
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
38 delete(obj.filename);
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
39
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
40 matObj = matfile(obj.filename,'Writable',true);
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
41 matObj.keys = keys;
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
42 matObj.entries = entries;
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
43 end
ddfb98209aa2 Fixed a bunch of problems regarding convergence and saving solutions
Jonatan Werpers <jonatan@werpers.com>
parents: 24
diff changeset
44
9
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
45 function list(obj, show_syntax)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
46 default_arg('show_syntax',false);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
47 for i = 1:length(obj.keys)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
48 fprintf('[%d]: %s', i, struct2string(obj.keys{i}));
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
49
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
50 if show_syntax
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
51 fprintf('\t%s',struct2syntax(obj.keys{i}));
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
52 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
53
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
54 fprintf('\n');
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
55 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
56 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
57
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
58 % Returns the index for a key. Returns 0 if the key doesn't exist
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
59 function I = getIndex(obj, key)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
60 I = 0;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
61
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
62 for i = 1:length(obj.keys)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
63 if isequal(key,obj.keys{i});
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
64 I = i;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
65 return
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
66 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
67 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
68 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
69
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
70 function b = isKey(obj, key)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
71 I = obj.getIndex(key);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
72
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
73 if I == 0
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
74 b = false;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
75 else
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
76 b = true;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
77 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
78 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
79
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
80 % Gets entries where key match exactly.
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
81 function e = get(obj, key)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
82 if ~obj.isKey(key);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
83 error('No such key: %s', struct2string(key));
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
84 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
85
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
86 I = obj.getIndex(key);
19
1644d000c304 Fixed bug in SolutionsFile.m. Updated calculateSolution to also save a function handle to the Discr constructor.
Jonatan Werpers <jonatan@werpers.com>
parents: 18
diff changeset
87 e = obj.getEntryByIndex(I); % unpack the cell array
9
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
88 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
89
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
90
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
91 % Handles indexing weirdness of matfile class
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
92 function e = getEntryByIndex(obj, I)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
93 e = obj.matfile.entries(1,I);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
94 e = e{1};
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
95 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
96
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
97 function e = deleteByIndex(obj, I)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
98 obj.keys(I) = [];
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
99 obj.matfile.keys = obj.keys;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
100
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
101 entries = obj.matfile.entries;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
102 entries(I) = [];
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
103 obj.matfile.entries = entries;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
104 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
105
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
106 % Handles indexing weirdness of matfile class
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
107 function setEntryByIndex(obj,I, entry, force_flag)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
108 default_arg('force_flag',false);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
109 if ~force_flag && ( I < 1 || I > length(obj.keys))
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
110 error('I is out of range. I = %d',I);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
111 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
112 obj.matfile.entries(1,I) = {entry};
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
113 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
114
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
115 function store(obj, key, entry)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
116 if obj.isKey(key);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
117 I = obj.getIndex(key);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
118 else
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
119 I = length(obj.keys) + 1;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
120 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
121
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
122 obj.keys{I} = key;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
123 obj.matfile.keys = obj.keys;
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
124 obj.setEntryByIndex(I,entry,true);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
125 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
126
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
127 function delete(obj, key)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
128 if ~obj.isKey(key);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
129 error('No such key: %s', struct2string(key));
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
130 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
131 I = obj.getIndex(key);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
132 obj.deleteByIndex(I);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
133 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
134
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
135
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
136
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
137 % Gets entries where the defined parts of partial_key matches the key of the entry
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
138 function [keys, entries] = find(obj,partial_key)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
139 keys = {};
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
140 entries = {};
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
141 for i = 1:length(obj.keys)
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
142 if structIsSubset(partial_key,obj.keys{i})
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
143 i
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
144 obj.keys{i}
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
145 keys{end + 1} = obj.keys{i};
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
146 entries{end + 1} = obj.getEntryByIndex(i);
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
147 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
148 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
149 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
150 end
6b9b2283e7ed Added class for handleing .mat files as a key-value store.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
151
18
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
152 methods(Static)
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
153 function merge(fn1, fn2, fnNew)
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
154 sf1 = SolutionFile(fn1);
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
155 sf2 = SolutionFile(fn2);
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
156
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
157 sfNew = SolutionFile(fnNew);
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
158
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
159 sfNew.keys = sf1.keys;
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
160 sfNew.matfile.keys = sf1.keys;
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
161 sfNew.matfile.entries = sf1.matfile.entries;
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
162
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
163 for i = 1:length(sf2.keys)
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
164 if sfNew.isKey(sf2.keys{i})
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
165 warning('Key ''%s'' exists in both files!',struct2string(sf2.keys{i}));
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
166 end
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
167 sfNew.store(sf2.keys{i},sf2.getEntryByIndex(i));
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
168 end
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
169 end
24
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
170
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
171
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
172 function b = keyIsEqual(key1,key2)
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
173 b = isequal(key1, key2);
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
174 end
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
175
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
176 function b = keyIsIn(key,keys)
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
177 b = false;
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
178 for i = 1:length(keys)
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
179 b = isequal(key, keys{i});
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
180 if b
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
181 return
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
182 end
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
183 end
986e3efd8543 Added some utility functions to SolutionFile.m
Jonatan Werpers <jonatan@werpers.com>
parents: 22
diff changeset
184 end
18
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
185 end
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
186
4d8068cb5c65 Added function to merge SolutionFiles.
Jonatan Werpers <jonatan@werpers.com>
parents: 9
diff changeset
187 end