Skip to content
Open
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
54 changes: 0 additions & 54 deletions @memZono/@hybZono/getLeaves.m

This file was deleted.

151 changes: 0 additions & 151 deletions @memZono/@hybZono/hybZono.m

This file was deleted.

64 changes: 0 additions & 64 deletions @memZono/@hybZono/plotAsConZono.m

This file was deleted.

24 changes: 0 additions & 24 deletions @memZono/@hybZono/plotHybZono1D.m

This file was deleted.

25 changes: 0 additions & 25 deletions @memZono/@hybZono/plotHybZono2D.m

This file was deleted.

25 changes: 0 additions & 25 deletions @memZono/@hybZono/plotHybZono3D.m

This file was deleted.

15 changes: 12 additions & 3 deletions @memZono/memZono.m
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,17 @@
% Plotting -------------------------
varargout = plot(obj, dims, varargin);
% Projection & Export ------------------
out = projection(obj,dims); % projection according to dims
out = projection(obj,dims,options); % projection according to dims
function out = Z(obj,dims), out = projection(obj,dims).Z_; end
function out = cartProdProj(obj1,obj2,outDims)
out = projection(cartProd(obj1,obj2),outDims,"removeExtraFactors",true);
end
% function out = addCons(obj1,obj2) %<== adds cons from 2nd object w/out changing dims of 1st one
% out = cartProdProj(obj1,obj2,obj1.dimKeys);
% end
% Additional methods (implimentations of abstractZono methods in memZono)
[NN,Y] = reluNN(X,Ws,bs,a);
[s,x_out] = supportFunc(obj,dims,d_in)
[s,x_out] = supportFunc(obj,dims,d_in);
end

%% Indexing ----------------------------
Expand All @@ -231,6 +237,9 @@
% &, and() - overide memoryIntersection w/ checks
function out = and(obj1,obj2,sharedDimLabels)
if nargin == 2, error('Must Supply labels for shared dimensions'); end
if ~isa(obj2,'memZono')
obj2 = memZono(obj2,sharedDimLabels); %<== attempt to call memZono with labels
end
out = memoryIntersection(obj1,obj2,sharedDimLabels);
end
% Overide for memoryUnion w/ checks ... NOT IMPLIMENTED
Expand All @@ -254,7 +263,7 @@
end
% all (extended and)
function out = all(in,ptn)
out = in{1}; if isemtpy(ptn), ptn = 'all'; end
out = in{1}; if isempty(ptn), ptn = 'all'; end
for i = 2:numel(in), out = and(out,in{i},sprintf('_%s_%d',ptn,i)); end %<========= not efficient
end
% any (extended or) ... NOT IMPLIMENTED
Expand Down
Loading