<commit_before>import pandas as pd

from chamber.models import params
from chamber.models import props

results = {'Pressure (Pa)': [], 'Temperature (K)': [],
					'Ralative Humidity': [], 'Schmidt Mills': [],
					'Schmidt Marrero': []}

if __name__=="__main__":
	for p in range(30000,100001,10000):
		# Uses the model limit as the upper bound of the loop range
		for t in range(275, int(310*pow(p/101325, 0.09)), 5):
			for t_dp in (props.get_tdp(p, t, i/100) for i in range(5, 90, 5)):
				# relative humidity should be a fraction between 0 and 1
				schmidt_mills = get_schmidt(p, t, t_dp, 'Mills')
				schmidt_marrero = get_schmidt(p, t, t_dp, 'Marrero')
				results['Pressure (Pa)'].append(p)
				results['Temperature (K)'].append(t)
				results['Ralative Humidity'].append(rh)
				results['Schmidt Mills'].append(schmidt_mills)
				results['Schmidt Marrero'].append(schmidt_marrero)

	df = pd.DataFrame.from_dict(results)
	df[['Pressure (Pa)', 'Temperature (K)', 'Ralative Humidity', 'Schmidt Mills',
	    'Schmidt Marrero']].to_csv('schmidt_comparison.csv', sep=',')<commit_msg>fixed merge conflicts<commit_after>import pandas as pd

from chamber.models import params
from chamber.models import props

results = {'Pressure (Pa)': [], 'Temperature (K)': [],
					'Ralative Humidity': [], 'Schmidt Mills': [],
					'Schmidt Marrero': []}

if __name__=="__main__":
	for p in range(30000,100001,10000):
		# Uses the model limit as the upper bound of the loop range
		for t in range(275, int(310*pow(p/101325, 0.09)), 5):
			for t_dp in (props.get_tdp(p, t, i/100) for i in range(5, 90, 5)):
				# relative humidity should be a fraction between 0 and 1
				schmidt_mills = params.get_schmidt(p, t, t_dp, 'Mills')
				schmidt_marrero = params.get_schmidt(p, t, t_dp, 'Marrero')
				results['Pressure (Pa)'].append(p)
				results['Temperature (K)'].append(t)
				results['Ralative Humidity'].append(rh)
				results['Schmidt Mills'].append(schmidt_mills)
				results['Schmidt Marrero'].append(schmidt_marrero)

	df = pd.DataFrame.from_dict(results)
	df[['Pressure (Pa)', 'Temperature (K)', 'Ralative Humidity', 'Schmidt Mills',
	    'Schmidt Marrero']].to_csv('schmidt_comparison.csv', sep=',')
{'fraction_non_alphanumeric': 0.1577028258887876, 'fraction_numerical': 0.037374658158614404, 'mean_word_length': 4.731070496083551, 'pattern_counts': {'":': 2, '<': 3, '<?xml version=': 0, '>': 3, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '5691579', 'n_tokens_mistral': 933, 'n_tokens_neox': 780, 'n_words': 207}