mirror of
				https://github.com/fjosw/pyerrors.git
				synced 2025-11-04 01:25:46 +01:00 
			
		
		
		
	This seems to be a known bug of flake8. I changed the code to avoid it...
This commit is contained in:
		
					parent
					
						
							
								0736a4e9f6
							
						
					
				
			
			
				commit
				
					
						2f9538e884
					
				
			
		
					 1 changed files with 6 additions and 4 deletions
				
			
		| 
						 | 
					@ -1149,8 +1149,9 @@ def covariance(obs1, obs2, correlation=False, **kwargs):
 | 
				
			||||||
    """
 | 
					    """
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for name in sorted(set(obs1.names + obs2.names)):
 | 
					    for name in sorted(set(obs1.names + obs2.names)):
 | 
				
			||||||
        if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None)
 | 
					        if (obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None):
 | 
				
			||||||
                or (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))):
 | 
					            raise Exception('Shapes of ensemble', name, 'do not fit')
 | 
				
			||||||
 | 
					        if (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]]))):
 | 
				
			||||||
            raise Exception('Shapes of ensemble', name, 'do not fit')
 | 
					            raise Exception('Shapes of ensemble', name, 'do not fit')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if not hasattr(obs1, 'e_names') or not hasattr(obs2, 'e_names'):
 | 
					    if not hasattr(obs1, 'e_names') or not hasattr(obs2, 'e_names'):
 | 
				
			||||||
| 
						 | 
					@ -1328,8 +1329,9 @@ def covariance3(obs1, obs2, correlation=False, **kwargs):
 | 
				
			||||||
    """
 | 
					    """
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for name in sorted(set(obs1.names + obs2.names)):
 | 
					    for name in sorted(set(obs1.names + obs2.names)):
 | 
				
			||||||
        if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None)
 | 
					        if (obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None):
 | 
				
			||||||
                or (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))):
 | 
					            raise Exception('Shapes of ensemble', name, 'do not fit')
 | 
				
			||||||
 | 
					        if (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]]))):
 | 
				
			||||||
            raise Exception('Shapes of ensemble', name, 'do not fit')
 | 
					            raise Exception('Shapes of ensemble', name, 'do not fit')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if not hasattr(obs1, 'e_names') or not hasattr(obs2, 'e_names'):
 | 
					    if not hasattr(obs1, 'e_names') or not hasattr(obs2, 'e_names'):
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue