CCCS and CCVS are not TwoPortElement, but TwoPinElement.

joh · May 6, 2016 · 537a68e · 537a68e
1 parent d969914
commit 537a68e
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/PySpice/Spice/BasicElement.py b/PySpice/Spice/BasicElement.py
@@ -769,7 +769,7 @@ class VoltageControlledVoltageSource(TwoPortElement):
 
 ####################################################################################################
 
-class CurrentControlledCurrentSource(TwoPortElement):
+class CurrentControlledCurrentSource(TwoPinElement):
 
     """This class implements a linear current-controlled current sources (CCCS).
 
@@ -779,8 +779,6 @@ class CurrentControlledCurrentSource(TwoPortElement):
 
     Keyword Parameters:
 
-      :attr:`source`
-
     Attributes:
 
       :attr:`source`
@@ -792,7 +790,7 @@ class CurrentControlledCurrentSource(TwoPortElement):
     alias = 'CCCS'
     prefix = 'F'
 
-    source = ElementNamePositionalParameter(position=0, key_parameter=True) # Fixme: right ???
+    source = ElementNamePositionalParameter(position=0, key_parameter=False)
     current_gain = ExpressionPositionalParameter(position=1, key_parameter=False)
 
 ####################################################################################################
@@ -826,7 +824,7 @@ class VoltageControlledCurrentSource(TwoPortElement):
 
 ####################################################################################################
 
-class CurrentControlledVoltageSource(TwoPortElement):
+class CurrentControlledVoltageSource(TwoPinElement):
 
     """This class implements a linear current-controlled voltage sources (ccvs).
 
@@ -836,8 +834,6 @@ class CurrentControlledVoltageSource(TwoPortElement):
 
     Keyword Parameters:
 
-      :attr:`source`
-
     Attributes:
 
       :attr:`source`
@@ -849,7 +845,7 @@ class CurrentControlledVoltageSource(TwoPortElement):
     alias = 'CCVS'
     prefix = 'H'
 
-    source = ElementNamePositionalParameter(position=0, key_parameter=True) # Fixme: right ????
+    source = ElementNamePositionalParameter(position=0, key_parameter=False)
     transresistance = ExpressionPositionalParameter(position=1, key_parameter=False)
 
 ####################################################################################################