Skip to content

Commit ec1f314

Browse files
cgranadecgranade
committed
Merge branch 'master' into feature-m2m
Conflicts: src/QUTesting.m
2 parents fa47a63 + 75c4479 commit ec1f314

File tree

9 files changed

+2712
-1478
lines changed

9 files changed

+2712
-1478
lines changed

‎doc/api-doc/GRAPE.nb

+1,892-980
Large diffs are not rendered by default.

‎doc/api-doc/QSim.nb

+303-303
Large diffs are not rendered by default.

‎doc/api-doc/QuantumSystems.nb

+191-155
Large diffs are not rendered by default.

‎src/GRAPE.m

+12-7
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
Begin["`Private`"];
318318

319319

320-
(* ::Subsection::Closed:: *)
320+
(* ::Subsection:: *)
321321
(*Pulses*)
322322

323323

@@ -482,15 +482,20 @@
482482
]
483483

484484

485-
(* ::Subsubsection::Closed:: *)
485+
(* ::Subsubsection:: *)
486486
(*Legalization and Normalization*)
487487

488488

489-
LegalizePulse[pulse_,controlRange_]:=
490-
If[ListQ[controlRange],
491-
{#1, Sequence@@MapThread[Max[Min[#1,Last@#2],First@#2]&, {{##2},controlRange}]}& @@@ pulse,
492-
{#1, Sequence@@( {##2} * Min[1, controlRange/Norm[{##2}]] )}& @@@ pulse
493-
]
489+
LegalizePulse[pulse_,controlRange_]:={#1, Sequence@@MapThread[Clip, {{##2},controlRange}, 1]}& @@@ pulse
490+
491+
492+
LegalizePulse[profile_][pulse_,controlRange_]:=Table[
493+
{
494+
pulse[[n,1]],
495+
Sequence@@MapThread[Clip, {pulse[[n,2;;]],profile[[n]]*controlRange}, 1]
496+
},
497+
{n,Length@pulse}
498+
]
494499

495500

496501
NormalizePulse[pulse_, controlRange_] :=

‎src/QSim.m

+19-10
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,7 @@
232232

233233

234234
(* ::Subsection::Closed:: *)
235-
(*Options and Helper Functions*)
236-
237-
238-
(* ::Subsubsection::Closed:: *)
239-
(*Options and Input Handling*)
235+
(*Options*)
240236

241237

242238
Options[PulseSim]={
@@ -252,10 +248,22 @@
252248
};
253249

254250

251+
(* ::Subsection::Closed:: *)
252+
(*Helper Functions*)
253+
254+
255+
(* ::Subsubsection::Closed:: *)
256+
(*Shaped Pulses*)
257+
258+
255259
GetPulseShapeMatrix[in_?PulseShapeFileQ]:=With[{out=Import[in]//N},Pick[out,Length[#]>1&/@out]]
256260
GetPulseShapeMatrix[in_?PulseShapeMatrixQ]:=in//N
257261

258262

263+
(* ::Subsubsection::Closed:: *)
264+
(*Time Steps*)
265+
266+
259267
(* ::Text:: *)
260268
(*If the step size is set to Automatic, let it be a tenth of the biggest element of H maximized over time, otherwise, the user has given the stepsize.*)
261269

@@ -347,7 +355,7 @@
347355
MakeSuperPulse[L_?LindbladQ,p_?DriftPulseQ]:=p
348356

349357

350-
(* ::Subsubsection::Closed:: *)
358+
(* ::Subsection::Closed:: *)
351359
(*Output Formatting*)
352360

353361

@@ -624,7 +632,7 @@
624632
(* Variables to store user-input values *)
625633
staVar,obsVar,funVar,
626634
(* Booleans *)
627-
isLindblad,isChannel,isSuper,hasInputState,requiresInputState,requiresProp,
635+
isLindblad,isChannel,isSuper,isUnitary,hasInputState,requiresInputState,requiresProp,
628636
(* List of keys to return *)
629637
outputList,
630638
(* Function which appends values of interest *)
@@ -640,6 +648,7 @@
640648
(* Determine whether we are doing open quantum systems *)
641649
isLindblad=LindbladQ[G];
642650
isChannel=ChannelPulseQ[p];
651+
isUnitary=UnitaryPulseQ[p];
643652
isSuper=isLindblad||OptionValue[ForceSuperoperator]||ChannelPulseQ[p]||MemberQ[OptionValue[SimulationOutput],Superoperators];
644653
hasInputState=SquareMatrixQ[staVar];
645654

@@ -690,23 +699,23 @@
690699
Which[
691700
requiresInputState&&requiresProp,
692701
If[isSuper,
693-
If[isLindblad||isChannel,
702+
If[(isLindblad||isChannel)&&Not[isUnitary],
694703
AppendReturnables[S_,t_]:=With[{\[Rho]=Devec[S.Vec[staVar]]},Map[AppendReturnables[#,Super[S],\[Rho],t]&,outputList]];,
695704
AppendReturnables[U_,t_]:=With[{\[Rho]=U.staVar.U\[ConjugateTranspose]},Map[AppendReturnables[#,Super@Unitary[U],\[Rho],t]&,outputList]];
696705
],
697706
AppendReturnables[U_,t_]:=With[{\[Rho]=U.staVar.U\[ConjugateTranspose]},Map[AppendReturnables[#,U,\[Rho],t]&,outputList]];
698707
];,
699708
requiresInputState,
700709
If[isSuper,
701-
If[isLindblad||isChannel,
710+
If[(isLindblad||isChannel)&&Not[isUnitary],
702711
AppendReturnables[S_,t_]:=With[{\[Rho]=Devec[S.Vec[staVar]]},Map[AppendReturnables[#,None,\[Rho],t]&,outputList]];,
703712
AppendReturnables[U_,t_]:=With[{\[Rho]=U.staVar.U\[ConjugateTranspose]},Map[AppendReturnables[#,None,\[Rho],t]&,outputList]];
704713
],
705714
AppendReturnables[U_,t_]:=With[{\[Rho]=U.staVar.U\[ConjugateTranspose]},Map[AppendReturnables[#,None,\[Rho],t]&,outputList]];
706715
];,
707716
requiresProp,
708717
If[isSuper,
709-
If[isLindblad||isChannel,
718+
If[(isLindblad||isChannel)&&Not[isUnitary],
710719
AppendReturnables[S_,t_]:=Map[AppendReturnables[#,Super[S],None,t]&,outputList];,
711720
AppendReturnables[U_,t_]:=Map[AppendReturnables[#,Super@Unitary[U],None,t]&,outputList];
712721
],

‎src/QUTesting.m

+5-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848

4949
(* ::Section:: *)
50-
(*Implimentation*)
50+
(*Implementation*)
5151

5252

5353
Begin["`Private`"];
@@ -92,7 +92,8 @@
9292
"QuantumSystems",
9393
"QuantumChannel",
9494
"LindbladSolver",
95-
"M2M"
95+
"M2M",
96+
"QSim"
9697
};
9798

9899

@@ -113,8 +114,8 @@
113114
fail=Length@Select[results,MatchQ[#,_->"F"]&];
114115
error=Length@Select[results,MatchQ[#,_->"E"]&];
115116
Print[ToString[pass]<>" of "<>ToString[n]<> " unit tests passed."];
116-
If[fail>0,Print[ToString[pass]<>" of "<>ToString[n]<> " unit tests failed."];
117-
If[error>0,Print[ToString[pass]<>" of "<>ToString[n]<> " unit tests returned errors."]];
117+
If[fail>0,Print[ToString[fail]<>" of "<>ToString[n]<> " unit tests failed."];
118+
If[error>0,Print[ToString[error]<>" of "<>ToString[n]<> " unit tests returned errors."]];
118119
]
119120
])
120121

‎src/QuantumSystems.m

+8-3
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
EntanglementF::dim = "Concurrence currently only works for 2-qubit states.";
166166

167167

168-
(* ::Section:: *)
168+
(* ::Section::Closed:: *)
169169
(*Implementation*)
170170

171171

@@ -679,6 +679,7 @@
679679

680680

681681
Options[QSimplifyRules]:={
682+
Protect->True,
682683
Power->True,
683684
Identity->None,
684685
Com->None,
@@ -692,13 +693,15 @@
692693

693694
QSimplifyRules[opLabel_,ops_?ListQ,opts:OptionsPattern[QSimplifyRules]]:=
694695
With[{
696+
attr=OptionValue[Protect],
695697
id=OptionValue[Identity],
696698
order=OptionValue["NormalOrder"],
697699
comAlg=OptionValue[Com],
698700
ctOps=OptionValue[ConjugateTranspose],
699701
tOps=OptionValue[Transpose],
700702
cOps=OptionValue[Conjugate],
701703
dotAlg=OptionValue[Dot]},
704+
If[MemberQ[{Automatic,True},attr],Protect[opLabel]];
702705
Join[
703706
If[MemberQ[{Automatic,True},OptionValue[Power]],
704707
QSimplifyPower[opLabel],
@@ -983,6 +986,7 @@
983986
QSimplifyRules[
984987
Spin,
985988
{Spin["X"],Spin["Y"],Spin["Z"],Spin["P"],Spin["M"]},
989+
Protect->False,
986990
Power->True,
987991
Identity->True,
988992
Com->{{I*Spin["Z"],-I*Spin["Y"],-Spin["Z"],Spin["Z"]},
@@ -1070,6 +1074,7 @@
10701074
QSimplifyRules[
10711075
Cavity,
10721076
{Cavity["a"],Cavity["c"],Cavity["n"]},
1077+
Protect->False,
10731078
Power->True,
10741079
Identity->True,
10751080
Com->{{Cavity["I"],Cavity["a"]},{-Cavity["c"]}},
@@ -1222,7 +1227,7 @@
12221227
]
12231228

12241229

1225-
(* ::Subsection:: *)
1230+
(* ::Subsection::Closed:: *)
12261231
(*State Measures*)
12271232

12281233

@@ -1322,7 +1327,7 @@
13221327
]]
13231328

13241329

1325-
(* ::Subsubsection:: *)
1330+
(* ::Subsubsection::Closed:: *)
13261331
(*Entanglement Measures*)
13271332

13281333

‎src/Tensor.m

+6-6
Original file line numberDiff line numberDiff line change
@@ -656,14 +656,14 @@
656656
(*Vectorization*)
657657

658658

659-
(* ::Subsubsection:: *)
659+
(* ::Subsubsection::Closed:: *)
660660
(*Options and bases*)
661661

662662

663663
Options[Vec]={Basis->"Col"};
664664

665665

666-
(* ::Subsubsection:: *)
666+
(* ::Subsubsection::Closed:: *)
667667
(*Main Functions*)
668668

669669

@@ -683,7 +683,7 @@
683683
True,funcs[[3]][basis,args]]]
684684

685685

686-
(* ::Subsubsection:: *)
686+
(* ::Subsubsection::Closed:: *)
687687
(*Convention Implementations*)
688688

689689

@@ -712,7 +712,7 @@
712712
BasisTransformation[ProductIdentityCol[A,C],Rule["Col",basis]]
713713

714714

715-
(* ::Subsubsection:: *)
715+
(* ::Subsubsection::Closed:: *)
716716
(*Change of Basis Matrix*)
717717

718718

@@ -729,7 +729,7 @@
729729
BasisMatrixCol[basis_List,n_Integer]:=
730730
BasisMatrixCol[basis,n]=
731731
Reravel[
732-
CircleTimes[SparseArray@BasisMatrixCol[basis,1],n]
732+
CircleTimes[SparseArray[BasisMatrixCol[basis,1]]->n]
733733
,Length[First[basis]]]
734734

735735

@@ -747,7 +747,7 @@
747747
BasisMatrix[Rule["Col",basis2],arg].BasisMatrix[Rule[basis1,"Col"],arg]
748748

749749

750-
(* ::Subsubsection:: *)
750+
(* ::Subsubsection::Closed:: *)
751751
(*Basis Transformations*)
752752

753753

0 commit comments

Comments
 (0)