gutc61 / Membrane (public) (License: Free) (since 2018-04-23) (hash sha1)
Membane project software
Clone URLs: https://rocketgit.com/user/gutc61/Membrane ssh://rocketgit@ssh.rocketgit.com/user/gutc61/Membrane git://git.rocketgit.com/user/gutc61/Membrane
master
List of commits:
Subject Hash Author Date (UTC)
Move combineCMs and traceOutCM and add simple test d4170659c28da6a0fe0e7723e20b5574d40d105f Jason Hoelscher-Obermaier 2016-06-15 14:31:02
Move ui/gui fcts to subfolders of misc/ 95f71a63ac5e8e1bf88d3f1db7f40759c3d2dd87 Jason Hoelscher-Obermaier 2016-06-15 14:02:34
Move matrix fcts is_orthogonal and is_symplectic and add simple tests b2e67152da7c9e2222e6f2b47679d4e6f111977a Jason Hoelscher-Obermaier 2016-06-15 14:00:33
Move fidelity.m and purity.m and add tests 1d27232478130ca3ab04b87620f26d7ffe3ef030 Jason Hoelscher-Obermaier 2016-06-15 13:42:58
Move smss.m and tmss.m 5bd484893e8e535b13ca20fc62b622433657cd77 Jason Hoelscher-Obermaier 2016-06-15 12:40:25
Simplify checkCMdimensions.m 4e45bd575f356bca400b03fb3c40dbe34125ea5d Jason Hoelscher-Obermaier 2016-06-15 12:33:55
Store software_version together with entanglement_evaluation object and export it d84aee1d422dcc64881a538c02cbaebb0513db51 Jason Hoelscher-Obermaier 2016-06-13 12:29:41
Add explicit comparison to eval. results as of commit 5d8d07 to ent.._eval.._test 7764d769c1b11f0363aeb061c0f6fa3326c5c362 Jason Hoelscher-Obermaier 2016-06-13 12:08:43
Change 'blocksize' argument in blocked_cross_correlation to key-value type syntax 5d8d0735783578340181b70eff55d071ba4d25d7 Jason Hoelscher-Obermaier 2016-06-13 09:36:01
Add quick version of entanglement evalution 63b2dc15c5fc7a7c5c9f870d783ab8f4d1c95396 Jason Hoelscher-Obermaier 2016-06-13 09:35:01
Fix wrong calculation of pulse modes (wrong pulse width; gamma -> 2 pi gamma) f2e86613d70f9f14b6f9b0fa28087c4acae94230 Jason Hoelscher-Obermaier 2016-06-13 09:33:34
Add fcts for obtaining commit hash for given git repo / all git repos on MATLAB path efef21a37871118248627a2889e1c3e3ddfaf0cd Jason Hoelscher-Obermaier 2016-06-10 14:10:53
Export pulse quadratures at end of run_entanglement_evaluation_simulation.m 1cc8f88b244ea1041aa7503b8d8141f8d85c9959 Jason Hoelscher-Obermaier 2016-06-07 13:51:00
Restore correct calculation of mode functions 70ae3d6ae7d2513d506cd400f72048e7c64e0def Jason Hoelscher-Obermaier 2016-06-07 13:37:44
Fix export of pulse quadratures f2d5f225c3f1c2c9a1313a1f63b4e5ef8c6e0ce3 Jason Hoelscher-Obermaier 2016-06-07 12:51:49
Auxfct for permuting data in several files ab144ff91342465644168d5e19691805bb1de3b7 Jason Hoelscher-Obermaier 2016-06-06 09:03:13
Correct permutation, add option for inverse permutation 6c615f43b7d08f0c29268a7b9216478b70dc0bb7 Jason Hoelscher-Obermaier 2016-06-06 08:54:21
Remove superfluous folder 3f32158ae47b1dabb7d207917ba9f28abfe346d3 Jason Hoelscher-Obermaier 2016-06-03 15:31:33
Add function to permute data from from q1...qn p1..pn.. to q1 p1... q1 p2 ... order 6d79e850ea8240822cae695b4daafd6a5594f578 Jason Hoelscher-Obermaier 2016-06-03 15:28:58
Add pseudohash as property to PXItrace 9893a652fbcd30d1c21555afc8feb1e89f2421f0 Jason Hoelscher-Obermaier 2016-06-03 15:25:33
Commit d4170659c28da6a0fe0e7723e20b5574d40d105f - Move combineCMs and traceOutCM and add simple test
Author: Jason Hoelscher-Obermaier
Author date (UTC): 2016-06-15 14:31
Committer name: Jason Hoelscher-Obermaier
Committer date (UTC): 2016-06-15 14:31
Parent(s): 95f71a63ac5e8e1bf88d3f1db7f40759c3d2dd87
Signer:
Signing key:
Signing status: N
Tree: f97920944eb3b3abcb354fb5da56cfd3d69a6cd9
File Lines added Lines deleted
misc/covmats/combineCMs.m 7 7
misc/covmats/combineCMs_traceOutCM_test.m 14 0
misc/covmats/traceOutCM.m 0 6
File misc/covmats/combineCMs.m renamed from misc/combineCMs.m (similarity 92%) (mode: 100644) (index a8b1659..e4ebd1a)
1 1 function combinedCM = combineCMs(varargin) function combinedCM = combineCMs(varargin)
2 2 %combinedCM = combineCMs(varargin) combines several covariance matrices %combinedCM = combineCMs(varargin) combines several covariance matrices
3 %into a single CM (assuming no correlations)
3 % into a single CM (assuming no correlations)
4 4
5 5 % It takes a varargin-list of the form cm_1, modevector_1, cm_2, % It takes a varargin-list of the form cm_1, modevector_1, cm_2,
6 6 % modevector_2,... where modevector_i contains the indices of the modes % modevector_2,... where modevector_i contains the indices of the modes
 
... ... function combinedCM = combineCMs(varargin)
8 8
9 9 maxQuadIndTot = 0; maxQuadIndTot = 0;
10 10 for k=1:2:length(varargin) for k=1:2:length(varargin)
11
11
12 12 l = (k+1)/2; l = (k+1)/2;
13
13
14 14 cm{l} = varargin{k}; cm{l} = varargin{k};
15 15 modeIndices{l} = varargin{k+1}; modeIndices{l} = varargin{k+1};
16
16
17 17 quadIndices{l} = quadIndicesFromModeIndices(modeIndices{l}); quadIndices{l} = quadIndicesFromModeIndices(modeIndices{l});
18
18
19 19 quadNo = length(quadIndices{l}); quadNo = length(quadIndices{l});
20 20 assert(all(size(cm{l})==[quadNo, quadNo]),... assert(all(size(cm{l})==[quadNo, quadNo]),...
21 21 ['CM no.', num2str(l), ' does not have the required size']); ['CM no.', num2str(l), ' does not have the required size']);
22
22
23 23 maxQuadInd = 2*max(modeIndices{l}); maxQuadInd = 2*max(modeIndices{l});
24 24 maxQuadIndTot = max(maxQuadIndTot, maxQuadInd); maxQuadIndTot = max(maxQuadIndTot, maxQuadInd);
25 25 end end
 
... ... end
33 33 end end
34 34
35 35 % %% test % %% test
36 % plotCorrelationMatrix(combineCMs(tmss(1.5),[1,3],tmss(2),[2,4]))
36 % plotCorrelationMatrix(combineCMs(tmss(1.5),[1,3],tmss(2),[2,4]))
File misc/covmats/combineCMs_traceOutCM_test.m added (mode: 100644) (index 0000000..75ad403)
1 function test_suite = combineCMs_traceOutCM_test %#ok<STOUT>
2 initTestSuite;
3
4 function combine_traceout_randommat_test
5 mat1 = randn(6,6);
6 modes1 = [1,3,5];
7 mat2 = randn(6,6);
8 modes2 = [2,4,6];
9 combined = combineCMs(mat1, modes1, mat2, modes2);
10
11 mat1_ = traceOutCM(combined, modes1);
12 mat2_ = traceOutCM(combined, modes2);
13 assertEqual(mat1, mat1_)
14 assertEqual(mat2, mat2_)
File misc/covmats/traceOutCM.m renamed from misc/traceOutCM.m (similarity 77%) (mode: 100644) (index b865cd7..58dc8d7)
... ... assert(quadNo <= length(cm),...
14 14 tracedOutCM = cm(quadIndices, quadIndices); tracedOutCM = cm(quadIndices, quadIndices);
15 15
16 16 end end
17
18 % %% test
19 % createTestMatrix(10,10)
20 % traceOutCM(createTestMatrix(10,10), [4,5])
21 % traceOutCM(createTestMatrix(10,10), [1,2])
22 % traceOutCM(createTestMatrix(10,10), [1,5])
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/gutc61/Membrane

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/gutc61/Membrane

Clone this repository using git:
git clone git://git.rocketgit.com/user/gutc61/Membrane

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main