Skip to content

Commit

Permalink
Major interface redesign
Browse files Browse the repository at this point in the history 
List of enhancement requests:

#29 Class to define options for hopfieldnetwork objects (new classes,
HopfieldNetworkOptions, HopfieldNetworkGQKPOptions and
HopfieldNetworkTSPOptions.
#30 Deprecate functions to create and validate options in network
classes (createOptions, isValidSetting and addDefaultOptionValues no
longer exist).
#31 Major parameter redesign (all classes have now CamelCase properties
-with some parameter exceptions-).
#32 Remove object handle in call to plot in tsphopfieldnet.
#33 Improve object display in command window for hopfieldnet and
tsphopfieldnet.
#34 Major classes redesign (new classes HopfieldNetwork,
HopfieldNetworkGQKP and HopfieldNetworkTSP).
  • Loading branch information
@mathinking
mathinking committed Apr 23, 2017
1 parent 905ad53 commit 24083ea
Show file tree
Hide file tree
Showing 130 changed files with 2,943 additions and 1,976 deletions.
148 changes: 74 additions & 74 deletions +Test/test_hopfieldnetwork.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,80 +6,80 @@
% [the name of the tested method]_[expected input / tested state]_[expected behavior]

% Checking hopfieldnet method createOptions
function createOptions_Unkwown_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('unknown',2),'hopfieldNetwork:unvalidSetting');
end

function createOptions_u0WrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('u0',uint8(2)),'hopfieldnetwork:invalid_datatype');
end
function createOptions_hwResourcesWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('hwResources',0),'hopfieldnetwork:invalid_datatype');
end
function createOptions_maxIterWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('maxIter',true),'hopfieldnetwork:invalid_datatype');
end
function createOptions_epsWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('e',{7}),'hopfieldnetwork:invalid_datatype');
end
function createOptions_qWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('q',single(0.05)),'hopfieldnetwork:invalid_datatype');
end
function createOptions_R_ITERWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('R_ITER',uint32(20)),'hopfieldnetwork:invalid_datatype');
end
function createOptions_dtWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('dt',single(0.01)),'hopfieldnetwork:invalid_datatype');
end
function createOptions_showCommandLineWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('showCommandLine',1),'hopfieldnetwork:invalid_datatype');
end
function createOptions_transferFcnWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('transferFcn',{'exponential'}),'hopfieldnetwork:invalid_datatype');
end
function createOptions_loggingVWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('loggingV',1),'hopfieldnetwork:invalid_datatype');
end
function createOptions_viewConvergenceWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('viewConvergence',1),'hopfieldnetwork:invalid_datatype');
end
function createOptions_viewConvergenceSpeedWrongType_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('viewConvergenceSpeed',single(0.2)),'hopfieldnetwork:invalid_datatype');
end

function createOptions_u0WrongValue_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('u0',0),'hopfieldnetwork:invalid_value');
end
function createOptions_hwResourcesWrongValue_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('hwResources','FPGA'),'hopfieldnetwork:invalid_value');
end
function createOptions_maxIterWrongValue_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('maxIter',0),'hopfieldnetwork:invalid_value');
end
function createOptions_eWrongValue_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('e',50),'hopfieldnetwork:invalid_value');
end
function createOptions_qWrongValue_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('q',0),'hopfieldnetwork:invalid_value');
end
function createOptions_R_ITERWrongValue_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('R_ITER',-1),'hopfieldnetwork:invalid_value');
end
function createOptions_dtWrongValue_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('dt',0),'hopfieldnetwork:invalid_value');
end
function createOptions_transferFcnWrongValue_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('transferFcn','linear'),'hopfieldnetwork:invalid_value');
end
function createOptions_viewConvergenceSpeedWrongValue_Errors(testCase)
verifyError(testCase,@()hopfieldnetwork.createOptions('viewConvergenceSpeed',1),'hopfieldnetwork:invalid_value');
end

function createOptions_ValidProperty_Works(testCase)
u0 = 0.35;
options = hopfieldnetwork.createOptions('u0',u0);
verifyEqual(testCase,options.setting.u0,u0);
end
% function createOptions_Unkwown_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('unknown',2),'hopfieldNetwork:unvalidSetting');
% end
%
% function createOptions_u0WrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('u0',uint8(2)),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_ExecutionEnvironmentWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('ExecutionEnvironment',0),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_maxIterWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('maxIter',true),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_epsWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('e',{7}),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_qWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('q',single(0.05)),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_R_ITERWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('R_ITER',uint32(20)),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_dtWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('dt',single(0.01)),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_verboseWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('Verbose',1),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_transferFcnWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('transferFcn',{'exponential'}),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_CheckpointPathWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('CheckpointPath',1),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_SimulationPlotWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('SimulationPlot',1),'hopfieldnetwork:invalid_datatype');
% end
% function createOptions_SimulationPlotPauseTimeWrongType_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('SimulationPlotPauseTime',single(0.2)),'hopfieldnetwork:invalid_datatype');
% end
%
% function createOptions_u0WrongValue_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('u0',0),'hopfieldnetwork:invalid_value');
% end
% function createOptions_ExecutionEnvironmentWrongValue_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('ExecutionEnvironment','FPGA'),'hopfieldnetwork:invalid_value');
% end
% function createOptions_maxIterWrongValue_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('maxIter',0),'hopfieldnetwork:invalid_value');
% end
% function createOptions_eWrongValue_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('e',50),'hopfieldnetwork:invalid_value');
% end
% function createOptions_qWrongValue_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('q',0),'hopfieldnetwork:invalid_value');
% end
% function createOptions_R_ITERWrongValue_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('R_ITER',-1),'hopfieldnetwork:invalid_value');
% end
% function createOptions_dtWrongValue_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('dt',0),'hopfieldnetwork:invalid_value');
% end
% function createOptions_transferFcnWrongValue_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('transferFcn','linear'),'hopfieldnetwork:invalid_value');
% end
% function createOptions_SimulationPlotPauseTimeWrongValue_Errors(testCase)
% verifyError(testCase,@()hopfieldnetwork.createOptions('SimulationPlotPauseTime',1),'hopfieldnetwork:invalid_value');
% end
%
% function createOptions_ValidProperty_Works(testCase)
% u0 = 0.35;
% options = hopfieldnetwork.createOptions('u0',u0);
% verifyEqual(testCase,options.setting.u0,u0);
% end
end

end
Loading

0 comments on commit 24083ea

Please sign in to comment.